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

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)));