联合丽格1.0.1

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

@@ -200,6 +200,11 @@ public class OrderClubServiceImpl implements OrderClubService {
             orderCommonService.setShopOrderInfo(shopOrder);
             // 设置付款金额
             orderCommonService.getDiscernReceiptAndSetShoporder(shopOrder);
+            if ((4 != shopOrder.getStatus() && 5 != shopOrder.getStatus()) && ((1 == shopOrder.getReceiptStatus() && (2 == shopOrder.getOnlinePay() || 0 == shopOrder.getOnlinePay())) || (2 == shopOrder.getReceiptStatus() && 2 == shopOrder.getOnlinePay()))) {
+                shopOrder.setCheckFlag(2);
+            } else {
+                shopOrder.setCheckFlag(1);
+            }
         });
         //不是协销，订单不可见屏蔽
         if (identity != 1) {

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

@@ -1198,15 +1198,9 @@ public class SubmitServiceImpl implements SubmitService {
         // 订单总额（商品金额+运费）-- 冷链运输费
         mainOrder.setPayTotalFee(payTotalFee.get());
         // 订单状态
-        if (0 == organizeId) {
-            if (3 == orderParamBo.getCartType()) {
-                // 协销 状态为 待确认
-                mainOrder.setStatus(0);
-            } else {
-                // 机构用户 状态为 待收待发
-                mainOrder.setStatus(11);
-                mainOrder.setConfirmTime(curDateStr);
-            }
+        if (3 == orderParamBo.getCartType()) {
+            // 协销 状态为 待确认
+            mainOrder.setStatus(0);
         } else {
             // 机构用户 状态为 待收待发
             mainOrder.setStatus(11);

src/main/resources/mapper/OrderClubMapper.xml

@@ -708,7 +708,10 @@
                         (SELECT secondHandOrderFlag FROM cm_order WHERE orderId = cso.orderId ) AS secondHandOrderFlag,
                         IFNULL(cso.receiptAmount,0) AS receiptAmount,
                         cso.eachDiscount,
-                        ifnull(s.payway, 0) AS payway,
+                        s.name AS shopName,
+                        IFNULL(s.payway, 0) AS payway,
+                        s.logo AS shopLogo,
+                        s.shopType AS shopType,
                         IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
                         ifnull(cso.receiptStatus, 1) as receiptStatus,
                         cso.shopStatus AS STATUS

src/main/resources/mapper/OrderSellerMapper.xml

@@ -458,25 +458,25 @@
         where spID = #{serviceProviderId}
     </select>
     <select id="getSellerOrderCount" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM cm_order
+        SELECT COUNT(*) FROM cm_shop_order
         WHERE delFlag = 0 AND userID IN
         <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
             #{userId}
         </foreach>
         <if test="orderState == 1 ">
-            AND status = '0'
+            AND shopStatus = 0
         </if>
         <if test="orderState == 2 ">
-            AND status IN(11,12,13,21,22,23)
+            AND receiptStatus = 1 AND shopStatus not in (4,5)
         </if>
         <if test="orderState == 3 ">
-            AND status IN(11,12,21,22,31,32)
+            AND sendOutStatus = 1 AND shopStatus not in (4,5)
         </if>
         <if test="orderState == 4 ">
-            AND status IN(12,13,22,23,32,33)
+            AND sendOutStatus = 3 AND shopStatus not in (4,5)
         </if>
         <if test="orderState == 5 ">
-            AND refundType IN(1,2)
+            AND (orderStatusFlag in (2, 3) or refundStatus = 3) AND shopStatus not in (4,5)
         </if>
     </select>
     <select id="getLastCheckOrderDate" resultType="java.util.Date">