小程序分配协销/协销小组权限

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

@@ -55,14 +55,19 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         } else {
             clubUserIds = orderSellerMapper.getClubUserIds(serviceProviderId);
         }
-        // 分页请求数据
-        PageHelper.startPage(pageNum, pageSize);
+        List<OrderVo> orderList = new ArrayList<OrderVo>();
         // 获取订单列表
-        List<OrderVo> orderList = orderSellerMapper.getOrderList(clubUserIds, listType, orderSubmitType, orderNo);
-        //设置主订单数据
-        orderList.forEach(this::setSellerOrder);
-        PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
-        return ResponseJson.success(pageInfo);
+        if (null != clubUserIds && clubUserIds.size() > 0) {
+            // 分页请求数据
+            PageHelper.startPage(pageNum, pageSize);
+            orderList = orderSellerMapper.getOrderList(clubUserIds, listType, orderSubmitType, orderNo);
+            //设置主订单数据
+            orderList.forEach(this::setSellerOrder);
+            PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
+            return ResponseJson.success(pageInfo);
+        } else {
+            return ResponseJson.success(new PageInfo<OrderVo>(orderList));
+        }
     }
 
     /**
@@ -97,15 +102,17 @@ public class OrderSellerServiceImpl implements OrderSellerService {
      */
     @Override
     public ResponseJson<PageInfo<OrderVo>> getOrderListClub(Integer serviceProviderId, Integer clubId, Integer listType, Integer orderSubmitType, int pageNum, int pageSize) {
-        // 判断该机构是不是该协销下的
+        // 判断该机构是不是该协销下的 1342采美默认协销经理(官方账号)协销id1342为默认，不受限制
         Integer spId = orderSellerMapper.getSpIdByClubId(clubId);
         // 协销组长和总管理员也可以看
         Integer leaderId = orderSellerMapper.findLeaderId(spId);
         Integer managerId = orderSellerMapper.findManagerId();
         boolean role = serviceProviderId.equals(leaderId) || serviceProviderId.equals(managerId);
         if (!role && !serviceProviderId.equals(spId)) {
-            //不是总管理员或组长，看是不是本人
-            return ResponseJson.error("该机构不是该协销下的机构！", null);
+            if (1342 != spId) {
+                //不是总管理员或组长，看是不是本人
+                return ResponseJson.error("该机构不是该协销下的机构！", null);
+            }
         }
         // 分页请求数据
         PageHelper.startPage(pageNum, pageSize);

src/main/resources/mapper/OrderClubMapper.xml

@@ -197,12 +197,9 @@
                rebateFlag,
                clauseID             AS clauseId,
                clauseName,
-               (case when orderType = '0' then
-                         (select case status when 91 then '采美默认协销经理(官方账号)' else linkMan end from serviceprovider where serviceProviderID
-                                                                                                                           = spID)
-                     else
-                         ''
-                   end) AS serviceName
+               (select case status when 91 then '采美默认协销经理(官方账号)' else linkMan end
+               from serviceprovider
+               where serviceProviderID = (SELECT spId FROM club WHERE clubId=cm_order.clubID)) AS serviceName
         FROM cm_order
         WHERE orderID = #{orderId}
     </select>