联合丽格1.0.1

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -241,7 +241,7 @@ public class OrderCommonService {
      */
     public void setShopOrderStatus(ShopOrderVo shopOrderVo) {
         // 11, 待付待收待发
-        if (1 == shopOrderVo.getStatus() ) {
+        if (1 == shopOrderVo.getStatus() && 1 == shopOrderVo.getOrderStatusFlag() && 1 == shopOrderVo.getRefundStatus()) {
             if ( 1 == shopOrderVo.getReceiptStatus() && 1 == shopOrderVo.getSendOutStatus()){
                 shopOrderVo.setStatus(11);
             } else if ( 1 == shopOrderVo.getReceiptStatus() && 2 == shopOrderVo.getSendOutStatus()) {
@@ -267,6 +267,9 @@ public class OrderCommonService {
         if (5 == shopOrderVo.getStatus() && logisticsCount > 0) {
             shopOrderVo.setStatus(6);
         }
+        if (1 != shopOrderVo.getOrderStatusFlag() || 1 != shopOrderVo.getRefundStatus()) {
+            shopOrderVo.setStatus(5);
+        }
     }
 
     /**

src/main/java/com/caimei365/order/model/vo/ShopOrderVo.java

@@ -286,6 +286,10 @@ public class ShopOrderVo implements Serializable {
      * （收款买家）收款状态：1待收款、2部分收款、3已收款
      */
     private Integer receiptStatus;
+    /**
+     * 订单状态标识，1:非退货退款订单、2：退货退款中、3退货退款完成
+     */
+    private Integer orderStatusFlag;
     /**
      * 退款状态：1无退款、3有退款
      */

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -863,7 +863,7 @@ public class CartClubServiceImpl implements CartClubService {
         if (null != cartList && cartList.size() > 0) {
 
             cartList.removeIf(cartItemVo ->
-                    cartItemVo.getValidFlag() == 2
+                    cartItemVo.getValidFlag() == 3
             );
             return ResponseJson.success(cartList.size());
         } else {

src/main/resources/mapper/OrderClubMapper.xml

@@ -286,6 +286,8 @@
             co.clauseID AS clauseId,
             co.invoiceFlag,
             ifnull(cso.receiptStatus, 1) as receiptStatus,
+            ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+            ifnull(cso.refundStatus, 1) as refundStatus,
             cso.shopStatus as status
         FROM cm_shop_order cso
                  LEFT JOIN shop s ON cso.shopID = s.shopID
@@ -429,16 +431,16 @@
             AND shopStatus = 0
         </if>
         <if test="orderState == 2 ">
-            AND receiptStatus = 1 AND shopStatus not in (4,5)
+            AND receiptStatus = 1 AND shopStatus not in (0, 4,5) AND orderStatusFlag = 1 AND refundStatus = 1
         </if>
         <if test="orderState == 3 ">
-            AND sendOutStatus = 1 AND shopStatus not in (4,5)
+            AND sendOutStatus = 1 AND shopStatus not in (0, 4,5) AND orderStatusFlag = 1 AND refundStatus = 1
         </if>
         <if test="orderState == 4 ">
-            AND sendOutStatus = 3 AND shopStatus not in (4,5)
+            AND sendOutStatus = 3 AND shopStatus not in (0, 4,5) AND orderStatusFlag = 1 AND refundStatus = 1
         </if>
         <if test="orderState == 5 ">
-            AND (orderStatusFlag in (2, 3) or refundStatus = 3) AND shopStatus not in (4,5)
+            AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4, 5)
         </if>
     </select>
     <select id="getOrderSeenCount" resultType="java.lang.Integer">
@@ -583,6 +585,8 @@
             cso.eachDiscount,
             IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
             ifnull(cso.receiptStatus, 1) as receiptStatus,
+            ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+            ifnull(cso.refundStatus, 1) as refundStatus,
             cso.shopStatus as status
         FROM cm_shop_order cso
                  LEFT JOIN shop s ON cso.shopID = s.shopID
@@ -592,16 +596,16 @@
                 AND cso.shopStatus = 0
             </if>
             <if test="status == 2 ">
-                AND cso.receiptStatus = 1 AND shopStatus not in (4,5)
+                AND cso.receiptStatus = 1 AND shopStatus not in (0, 4, 5) AND cso.orderStatusFlag = 1 AND cso.refundStatus = 1
             </if>
             <if test="status == 3 ">
-                AND cso.sendOutStatus = 1 AND shopStatus not in (4,5)
+                AND cso.sendOutStatus = 1 AND shopStatus not in (0, 4, 5) AND cso.orderStatusFlag = 1 AND cso.refundStatus = 1
             </if>
             <if test="status == 4 ">
-                AND cso.sendOutStatus = 3 AND shopStatus not in (4,5)
+                AND cso.sendOutStatus = 3 AND shopStatus not in (0, 4, 5) AND cso.orderStatusFlag = 1 AND cso.refundStatus = 1
             </if>
             <if test="status == 5 ">
-                AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus = 3) AND cso.shopStatus not in (4,5)
+                AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus in (2, 3)) AND cso.shopStatus not in (0, 4, 5)
             </if>
             <if test="shopOrderNo != null and shopOrderNo != '' ">
                 AND cso.shopOrderNo = #{shopOrderNo}
@@ -714,6 +718,8 @@
                         s.shopType AS shopType,
                         IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
                         ifnull(cso.receiptStatus, 1) as receiptStatus,
+                        ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+                        ifnull(cso.refundStatus, 1) as refundStatus,
                         cso.shopStatus AS STATUS
         FROM cm_shop_order cso
                  LEFT JOIN cm_order_product cop ON cso.shopOrderId = cop.shopOrderId

src/main/resources/mapper/OrderCommonMapper.xml

@@ -447,7 +447,7 @@
                p.productType
         FROM cm_order_product cop
                  LEFT JOIN product p ON cop.productID = p.productID
-                 LEFT JOIN cm_shop_order cso ON cop.orderId = cso.orderId
+                 LEFT JOIN cm_shop_order cso ON cop.shopOrderId = cso.shopOrderId
         WHERE cso.shopOrderId = #{shopOrderId}
           AND IF(cso.useBeanAmount = 0, 1 = 1, cop.shopid != 998)
         ORDER BY cop.discountPrice DESC
@@ -570,6 +570,8 @@
         cso.eachDiscount,
         IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
+        ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+        ifnull(cso.refundStatus, 1) as refundStatus,
         cso.shopStatus as status
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID

src/main/resources/mapper/OrderSellerMapper.xml

@@ -142,15 +142,17 @@
         s.shopType AS shopType,
         IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
+        ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+        ifnull(cso.refundStatus, 1) as refundStatus,
         cso.shopStatus as status
         <if test="orderSubmitType == 3">
-            ,s.linkMan as serviceName
+            ,ser.linkMan as serviceName
         </if>
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID
         <if test="orderSubmitType == 3">
             LEFT JOIN club c ON cso.userId=c.userId
-            LEFT JOIN serviceprovider s ON c.spId=s.serviceProviderID
+            LEFT JOIN serviceprovider ser ON c.spId=ser.serviceProviderID
         </if>
         <where>
             cso.delFlag = 0 AND cso.userID IN
@@ -161,16 +163,16 @@
                 AND cso.shopStatus = 0
             </if>
             <if test="listType == 2 ">
-                AND cso.payStatus = 1
+                AND receiptStatus = 1 AND shopStatus not in (0, 4,5) AND cso.orderStatusFlag = 1 AND cso.refundStatus = 1
             </if>
             <if test="listType == 3 ">
-                AND cso.sendOutStatus = 1
+                AND cso.sendOutStatus = 1 AND cso.shopStatus not in (0,4,5) AND cso.orderStatusFlag = 1 AND cso.refundStatus = 1
             </if>
             <if test="listType == 4 ">
-                AND cso.sendOutStatus = 3
+                AND cso.sendOutStatus = 3 AND cso.shopStatus not in (0,4,5) AND cso.orderStatusFlag = 1 AND cso.refundStatus = 1
             </if>
             <if test="listType == 5 ">
-                AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus = 2)
+                AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus in (2, 3)) AND cso.shopStatus not in (0,4,5)
             </if>
             <if test="shopOrderNo != null and shopOrderNo != '' ">
                 AND cso.shopOrderNo = #{shopOrderNo}
@@ -306,6 +308,8 @@
         s.shopType AS shopType,
         IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
+        ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+        ifnull(cso.refundStatus, 1) as refundStatus,
         cso.shopStatus as status
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID
@@ -314,16 +318,16 @@
             AND cso.shopStatus = 0
         </if>
         <if test="listType == 2 ">
-            AND cso.payStatus = 1
+            AND cso.receiptStatus = 1 AND cso.shopStatus not in (0, 4,5)
         </if>
         <if test="listType == 3 ">
-            AND cso.sendOutStatus = 1
+            AND cso.sendOutStatus = 1 AND cso.shopStatus not in (0, 4,5)
         </if>
         <if test="listType == 4 ">
-            AND cso.sendOutStatus = 3
+            AND cso.sendOutStatus = 3 AND cso.shopStatus not in (0, 4,5)
         </if>
         <if test="listType == 5 ">
-            AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus = 2)
+            AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus in( 2, 3 )) AND cso.shopStatus not in (0, 4,5)
         </if>
         <if test="orderSubmitType == 1">
             AND cso.orderSubmitType IN (0,1,2)
@@ -440,6 +444,8 @@
         s.shopType AS shopType,
         IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
+        ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+        ifnull(cso.refundStatus, 1) as refundStatus,
         cso.shopStatus as status
         FROM cm_shop_order cso
         LEFT JOIN cm_order_product cop ON cso.shopOrderId = cop.shopOrderId
@@ -467,16 +473,16 @@
             AND shopStatus = 0
         </if>
         <if test="orderState == 2 ">
-            AND receiptStatus = 1 AND shopStatus not in (4,5)
+            AND receiptStatus = 1 AND shopStatus not in (0, 4, 5)
         </if>
         <if test="orderState == 3 ">
-            AND sendOutStatus = 1 AND shopStatus not in (4,5)
+            AND sendOutStatus = 1 AND shopStatus not in (0, 4, 5)
         </if>
         <if test="orderState == 4 ">
-            AND sendOutStatus = 3 AND shopStatus not in (4,5)
+            AND sendOutStatus = 3 AND shopStatus not in (0, 4, 5)
         </if>
         <if test="orderState == 5 ">
-            AND (orderStatusFlag in (2, 3) or refundStatus = 3) AND shopStatus not in (4,5)
+            AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4, 5)
         </if>
     </select>
     <select id="getLastCheckOrderDate" resultType="java.util.Date">

src/main/resources/mapper/ShipMapper.xml

@@ -129,7 +129,8 @@
             a.settlestatus,
             ifnull(a.sendOutStatus, 1) as sendOutStatus,
             ifnull(a.receiptStatus, 1) as receiptStatus,
-            a.refundStatus,
+            ifnull(a.orderStatusFlag, 1) as orderStatusFlag,
+            ifnull(a.refundStatus, 1) as refundStatus,
             ifnull(s.payway, 0) AS payway,
             a.shopStatus as status,
             a.splitFlag,
@@ -277,7 +278,8 @@
             cso.settlestatus,
             ifnull(cso.sendOutStatus, 1) as sendOutStatus,
             ifnull(cso.receiptStatus, 1) as receiptStatus,
-            cso.refundStatus,
+            ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
+            ifnull(cso.refundStatus, 1) as refundStatus,
             ifnull(s.payway, 0) AS payway,
             cso.shopStatus as status,
             cso.splitFlag,