Merge remote-tracking branch 'origin/v2' into v2

marketing-service/src/main/java/com/ssy/lingxi/marketing/controller/activity/PlatformActivitySignUpController.java

@@ -212,7 +212,7 @@ public class PlatformActivitySignUpController extends BaseController {
     }
 
     /**
-     * 待提交报名资料-列表查询
+     * 待提交报名资料-提交报名
      * @return
      **/
     @RequestMapping(value = "/submit/sign/up", method = RequestMethod.POST)

marketing-service/src/main/java/com/ssy/lingxi/marketing/entity/activity/PlatformActivityGoodsDO.java

@@ -123,6 +123,11 @@ public class PlatformActivityGoodsDO implements Serializable {
     @Column(columnDefinition = "int4")
     private Integer restrictTotalNum;
     /**
+     * 商品主图
+     */
+    @Column(columnDefinition = "varchar(250)")
+    private String productImgUrl;
+    /**
      * 附属商品信息(仅赠送促销、换购、套票)
      */
     @Transient
@@ -285,6 +290,14 @@ public class PlatformActivityGoodsDO implements Serializable {
         this.restrictTotalNum = restrictTotalNum;
     }
 
+    public String getProductImgUrl() {
+        return productImgUrl;
+    }
+
+    public void setProductImgUrl(String productImgUrl) {
+        this.productImgUrl = productImgUrl;
+    }
+
     public List<PlatformActivityGoodsSubsidiaryDO> getGoodsSubsidiaryDOList() {
         return goodsSubsidiaryDOList;
     }

marketing-service/src/main/java/com/ssy/lingxi/marketing/entity/activity/PlatformActivityGoodsSubsidiaryDO.java

@@ -92,6 +92,11 @@ public class PlatformActivityGoodsSubsidiaryDO implements Serializable {
      * */
     @Column(columnDefinition = "numeric")
     private BigDecimal groupPrice;
+    /**
+     * 赠品主图
+     */
+    @Column(columnDefinition = "varchar(250)")
+    private String productImgUrl;
 
 
     public Long getId() {
@@ -205,4 +210,12 @@ public class PlatformActivityGoodsSubsidiaryDO implements Serializable {
     public void setGroupPrice(BigDecimal groupPrice) {
         this.groupPrice = groupPrice;
     }
+
+    public String getProductImgUrl() {
+        return productImgUrl;
+    }
+
+    public void setProductImgUrl(String productImgUrl) {
+        this.productImgUrl = productImgUrl;
+    }
 }

marketing-service/src/main/java/com/ssy/lingxi/marketing/model/vo/activity/request/PfActivitySignUpGoodsReq.java

@@ -83,6 +83,11 @@ public class PfActivitySignUpGoodsReq implements Serializable {
     @Range(min = 1,message = "活动限购总数量必须大于0")
     private Integer restrictTotalNum;
     /**
+     * 活动商品图片
+     */
+    @NotNull(message = "活动商品图片地址不能为空")
+    private String productImgUrl;
+    /**
      * 商品赠品、换购商品、套餐商品
      */
     private List<PfActivitySignUpGoodsSubsidiaryReq> goodsSubsidiaryList;

marketing-service/src/main/java/com/ssy/lingxi/marketing/model/vo/activity/request/PfActivitySignUpGoodsSubsidiaryReq.java

@@ -71,4 +71,8 @@ public class PfActivitySignUpGoodsSubsidiaryReq implements Serializable {
      * 套餐价格
      * */
     private BigDecimal groupPrice;
+    /**
+     * 赠品主图
+     */
+    private String productImgUrl;
 }

marketing-service/src/main/java/com/ssy/lingxi/marketing/model/vo/activity/response/PfActivitySignUpGoodsPageResp.java

@@ -112,4 +112,8 @@ public class PfActivitySignUpGoodsPageResp implements Serializable {
      * */
     
     private Integer restrictTotalNum;
+    /**
+     * 活动商品图片
+     */
+    private String productImgUrl;
 }

marketing-service/src/main/java/com/ssy/lingxi/marketing/model/vo/activity/response/PfActivitySignUpSubsidiaryGoodsResp.java

@@ -68,4 +68,8 @@ public class PfActivitySignUpSubsidiaryGoodsResp implements Serializable {
      * 套餐价格
      * */
     private BigDecimal groupPrice;
+    /**
+     * 赠品主图
+     */
+    private String productImgUrl;
 }

order-service/src/main/java/com/ssy/lingxi/order/model/vo/common/request/OrderAfterSalePageVO.java

@@ -4,6 +4,8 @@ import com.ssy.lingxi.common.model.vo.PageVO;
 import com.ssy.lingxi.order.handler.annotation.DateStringFormatAnnotation;
 import com.ssy.lingxi.order.handler.annotation.OrderTypeAnnotation;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
 import java.io.Serializable;
@@ -39,6 +41,14 @@ public class OrderAfterSalePageVO extends PageVO implements Serializable {
     private Integer orderType;
 
     /**
+     * 售后类型，2-换货，3-退货，4-维修
+     */
+    @NotNull(message = "售后类型不能为空，2-换货，3-退货，4-维修")
+    @Min(value = 2, message = "售后类型参数错误，2-换货，3-退货，4-维修")
+    @Max(value = 4, message = "售后类型参数错误，2-换货，3-退货，4-维修")
+    private Integer afterSalesType;
+
+    /**
      * 订单编号
      */
     private String orderNo;
@@ -84,6 +94,14 @@ public class OrderAfterSalePageVO extends PageVO implements Serializable {
         this.orderType = orderType;
     }
 
+    public Integer getAfterSalesType() {
+        return afterSalesType;
+    }
+
+    public void setAfterSalesType(Integer afterSalesType) {
+        this.afterSalesType = afterSalesType;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }

order-service/src/main/java/com/ssy/lingxi/order/serviceimpl/web/OrderCommonServiceImpl.java

@@ -135,6 +135,8 @@ public class OrderCommonServiceImpl implements IOrderCommonService {
         query.where(qOrder.buyerMemberId.eq(buyerMemberId).and(qOrder.buyerRoleId.eq(buyerRoleId)).and(qOrder.vendorMemberId.eq(pageVO.getVendorMemberId())).and(qOrder.vendorRoleId.eq(pageVO.getVendorRoleId())).and(qOrder.vendorMemberId.eq(pageVO.getVendorMemberId())).and(qOrder.orderType.eq(pageVO.getOrderType())));
         //订单状态：只显示已收到第一批货之后的订单且当前订单外部状态不是待确认支付结果
         query.where(qOrder.hasPaid.isTrue().and(qOrder.outerStatus.ne(OrderOuterStatusEnum.TO_CONFIRM_PAYMENT.getCode())));
+        //流程类型
+        query.where(qOrderTradeProcess.processType.eq(pageVO.getAfterSalesType()));
         //流程规则配置
         query.where(qOrderTradeProcess.allProducts.isTrue().or(qOrderTradeProcessProduct.productId.eq(qOrderProduct.productId).and(qOrderTradeProcessProduct.skuId.eq(qOrderProduct.skuId))));
 
@@ -212,6 +214,8 @@ public class OrderCommonServiceImpl implements IOrderCommonService {
         query.where(qOrder.buyerMemberId.eq(buyerMemberId).and(qOrder.buyerRoleId.eq(buyerRoleId)).and(qOrder.vendorMemberId.eq(pageVO.getVendorMemberId())).and(qOrder.vendorRoleId.eq(pageVO.getVendorRoleId())).and(qOrder.vendorMemberId.eq(pageVO.getVendorMemberId())).and(qOrder.orderType.eq(pageVO.getOrderType())));
         //订单状态：只显示已收到第一批货之后的订单且当前订单外部状态不是待确认支付结果
         query.where(qOrder.hasPaid.isTrue().and(qOrder.outerStatus.ne(OrderOuterStatusEnum.TO_CONFIRM_PAYMENT.getCode())));
+        //流程类型
+        query.where(qOrderPurchaseProcess.processType.eq(pageVO.getAfterSalesType()));
         //流程规则配置
         query.where(qOrderPurchaseProcess.allContracts.isTrue().or(qOrderPurchaseProcessContract.contractId.eq(qOrderContract.contractId)));