bugfix

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

@@ -37,15 +37,15 @@ public class OrderSellerServiceImpl implements OrderSellerService {
      * @param serviceProviderId 协销Id
      * @param listType          1:待确认,2:待付款,3:待发货,4:已发货,5:退货款
      * @param orderSubmitType   1：自主订单， 2:协销或后台订单 ,3:组员订单
-     * @param shopOrderNo           订单编号
+     * @param shopOrderNo       订单编号
      * @param pageNum           页码
      * @param pageSize          每页数量
      */
     @Override
-    public ResponseJson<PageInfo<ShopOrderVo>> getOrderList(Integer serviceProviderId, Integer type,Integer listType, Integer orderSubmitType, String shopOrderNo, Integer groupServiceId, int pageNum, int pageSize) {
+    public ResponseJson<PageInfo<ShopOrderVo>> getOrderList(Integer serviceProviderId, Integer type, Integer listType, Integer orderSubmitType, String shopOrderNo, Integer groupServiceId, int pageNum, int pageSize) {
         // 获取该协销下的机构用户Id
         List<Integer> clubUserIds = new ArrayList<>();
-        if(null==type){
+        if (null == type) {
             if (null != orderSubmitType && 3 == orderSubmitType) {
                 if (null != groupServiceId && groupServiceId > 0) {
                     //组员协销id不为空的时候，查某个组员名下的单
@@ -57,11 +57,11 @@ public class OrderSellerServiceImpl implements OrderSellerService {
             } else {
                 clubUserIds = orderSellerMapper.getClubUserIds(serviceProviderId);
             }
-        }else {
+        } else {
             if (null != orderSubmitType && 3 == orderSubmitType) {
-                clubUserIds = orderSellerMapper.getDistributionClubUserIds(null,serviceProviderId);
-            }else {
-                clubUserIds = orderSellerMapper.getDistributionClubUserIds(serviceProviderId,null);
+                clubUserIds = orderSellerMapper.getDistributionClubUserIds(null, serviceProviderId);
+            } else {
+                clubUserIds = orderSellerMapper.getDistributionClubUserIds(serviceProviderId, null);
             }
         }
 
@@ -134,11 +134,11 @@ public class OrderSellerServiceImpl implements OrderSellerService {
     public ResponseJson<PageInfo<ShopOrderVo>> getOrderListClub(Integer serviceProviderId, Integer clubId, Integer listType, Integer orderSubmitType, Integer type, int pageNum, int pageSize) {
         // 判断该机构是不是该协销下的 1342采美默认协销经理(官方账号)协销id1342为默认，不受限制
         Integer spId = orderSellerMapper.getSpIdByClubId(clubId);
-        Integer identity = baseMapper.getUserIdentity(baseMapper.getUserIdByClubId(clubId), null,null);
+        Integer identity = baseMapper.getUserIdentity(baseMapper.getUserIdByClubId(clubId), null, null);
         // 协销组长和总管理员也可以看
         Integer leaderId = orderSellerMapper.findLeaderId(spId);
         Integer managerId = orderSellerMapper.findManagerId();
-        boolean role = serviceProviderId.equals(leaderId) || serviceProviderId.equals(managerId)||identity==8;
+        boolean role = serviceProviderId.equals(leaderId) || serviceProviderId.equals(managerId) || identity == 8;
         if (!role && !serviceProviderId.equals(spId)) {
             if (1342 != spId) {
                 //不是总管理员或组长，看是不是本人
@@ -196,6 +196,9 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         Map<String, Object> map = new HashMap<>(7);
         // 获取协销用户下的机构ID列表
         List<Integer> clubUserIds = orderSellerMapper.getClubIdsBySellerId(serviceProviderId);
+        if (clubUserIds.size() <= 0) {
+            return null;
+        }
         // 1.全部数量
         Integer totalCount = 0;
         if (null != clubUserIds && clubUserIds.size() > 0) {

src/main/resources/mapper/OrderSellerMapper.xml

@@ -480,7 +480,10 @@
     </select>
     <select id="getSellerOrderCount" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM cm_shop_order
-        WHERE delFlag = 0
+        WHERE delFlag = 0 AND userID IN
+        <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
         <if test="orderState == 1 ">
             AND shopStatus = 0
         </if>
@@ -496,12 +499,6 @@
         <if test="orderState == 5 ">
             AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4)
         </if>
-          <if test="userIds.size() > 0">
-            AND userID IN
-            <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
-                #{userId}
-            </foreach>
-          </if>
     </select>
     <select id="getLastCheckOrderDate" resultType="java.util.Date">
         SELECT lastCheckOrderDate