联合丽格1.0.1

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

@@ -1044,6 +1044,7 @@ public class OrderClubServiceImpl implements OrderClubService {
         } else {
             loginData = remoteCallService.appletsOrganizeAuthorization(code, encryptedData, iv, headers, userId);
         }
+        log.info("loginData====="+loginData);
         if (StringUtils.isEmpty(loginData)) {
             return ResponseJson.error("微信授权登录异常！", null);
         }

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

@@ -162,6 +162,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
             } else {
                 jsonStr = userFeign.appletsAuthorization(code, encryptedData, iv, referer);
             }
+            log.info("jsonStr======"+jsonStr);
             JSONObject parseObject = JSONObject.parseObject(jsonStr);
             if (0 == parseObject.getInteger("code") || -4 == parseObject.getInteger("code")) {
                 // 授权登录成功（游客-4）

src/main/resources/mapper/OrderClubMapper.xml

@@ -431,16 +431,16 @@
             AND shopStatus = 0
         </if>
         <if test="orderState == 2 ">
-            AND receiptStatus = 1 AND shopStatus not in (0, 4,5) AND orderStatusFlag = 1 AND refundStatus = 1
+            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 (0, 4,5) AND orderStatusFlag = 1 AND refundStatus = 1
+            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 (0, 4,5) AND orderStatusFlag = 1 AND refundStatus = 1
+            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 in (2, 3)) AND shopStatus not in (0, 4, 5)
+            AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4)
         </if>
     </select>
     <select id="getOrderSeenCount" resultType="java.lang.Integer">
@@ -605,7 +605,7 @@
                 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 in (2, 3)) AND cso.shopStatus not in (0, 4, 5)
+                AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus in (2, 3)) AND cso.shopStatus not in (0, 4)
             </if>
             <if test="shopOrderNo != null and shopOrderNo != '' ">
                 AND cso.shopOrderNo = #{shopOrderNo}

src/main/resources/mapper/OrderSellerMapper.xml

@@ -172,7 +172,7 @@
                 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 in (2, 3)) AND cso.shopStatus not in (0,4,5)
+                AND (cso.orderStatusFlag in (2, 3) or cso.refundStatus in (2, 3)) AND cso.shopStatus not in (0,4)
             </if>
             <if test="shopOrderNo != null and shopOrderNo != '' ">
                 AND cso.shopOrderNo = #{shopOrderNo}
@@ -482,7 +482,7 @@
             AND sendOutStatus = 3 AND shopStatus not in (0, 4, 5)
         </if>
         <if test="orderState == 5 ">
-            AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4, 5)
+            AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4)
         </if>
     </select>
     <select id="getLastCheckOrderDate" resultType="java.util.Date">