协销用户下的机构userIds

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

@@ -545,7 +545,9 @@ public class ReceiptServiceImpl implements ReceiptService {
             List<Integer> permissions = receiptUser.getPermissions();
             //协销与自身相关的订单款
             if (!permissions.contains(10) && permissions.contains(13)) {
-                setClubUserIds(paramsBo, receiptUser);
+                // 获取该协销收款用户下的机构userIds
+                List<Integer> clubUserIds = getClubUserIds(receiptUser);
+                paramsBo.setUserIds(clubUserIds);
             }
         }
         // 非订单款
@@ -567,7 +569,8 @@ public class ReceiptServiceImpl implements ReceiptService {
             //协销与自身相关的返佣款
             if (!permissions.contains(11) && permissions.contains(14)) {
                 // 获取该协销收款用户下的机构userIds
-                setClubUserIds(paramsBo, receiptUser);
+                List<Integer> clubUserIds = getClubUserIds(receiptUser);
+                paramsBo.setUserIds(clubUserIds);
             }
         }
         // 供应商退款
@@ -581,7 +584,8 @@ public class ReceiptServiceImpl implements ReceiptService {
             //协销与自身相关的供应商退款
             if (!permissions.contains(12) && permissions.contains(15)) {
                 // 获取该协销收款用户下的机构userIds
-                setClubUserIds(paramsBo, receiptUser);
+                List<Integer> clubUserIds = getClubUserIds(receiptUser);
+                paramsBo.setUserIds(clubUserIds);
             }
         }
 
@@ -608,7 +612,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     /**
      * 设置协销用户下的机构userIds
      */
-    private void setClubUserIds(ReceiptParamsBo paramsBo, ReceiptUserVo receiptUser) {
+    private List<Integer> getClubUserIds(ReceiptUserVo receiptUser) {
         List<Integer> clubUserIds = new ArrayList<>();
         if (1 == receiptUser.getUserType()) {
             // 获取该协销收款用户下的机构userIds
@@ -618,7 +622,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         if (CollectionUtils.isEmpty(clubUserIds)) {
             clubUserIds.add(0);
         }
-        paramsBo.setUserIds(clubUserIds);
+        return clubUserIds;
     }
 
     /**
@@ -653,17 +657,9 @@ public class ReceiptServiceImpl implements ReceiptService {
                 log.info("【线下收款】-----已确认--------");
             }
             if (!CollectionUtils.isEmpty(orderList)) {
-                // 用户openid
-                String openid = headers.getFirst("x-openid");
-                // 获取该收款用户下的机构userIds
-                List<Integer> clubUserIds = null;
-                if (1 == receiptUser.getUserType()) {
-                    // 获取该协销收款用户下的机构userIds
-                    Integer spId = receiptMapper.getServiceProviderId(receiptUser.getUnionId());
-                    clubUserIds = receiptMapper.getClubUserIdBySpId(spId);
-                }
+                List<Integer> clubUserIds = getClubUserIds(receiptUser);
                 for (OrderVo order : orderList) {
-                    if (4 == receiptUser.getUserType() || (null != clubUserIds && clubUserIds.contains(order.getUserId()))) {
+                    if (4 == receiptUser.getUserType() || clubUserIds.contains(order.getUserId())) {
                         // 收款详情是否可以查看
                         order.setAuthority(true);
                     }
@@ -792,15 +788,8 @@ public class ReceiptServiceImpl implements ReceiptService {
         if (null == type || 0 == type) {
             type = 0;
         }
-        // 用户openid
-        String openid = headers.getFirst("x-openid");
         // 获取该收款用户下的机构userIds
-        List<Integer> userIds = null;
-        if (1 == receiptUser.getUserType()) {
-            // 获取该协销收款用户下的机构userIds
-            Integer spId = receiptMapper.getServiceProviderId(receiptUser.getUnionId());
-            userIds = receiptMapper.getClubUserIdBySpId(spId);
-        }
+        List<Integer> clubUserIds = getClubUserIds(receiptUser);
         String userName;
         Integer orderId = null;
         try {
@@ -816,7 +805,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             orderId = null;
         }
         ReceiptParamsBo params = new ReceiptParamsBo();
-        params.setUserIds(userIds);
+        params.setUserIds(clubUserIds);
         params.setOrderId(orderId);
         params.setExcludeOrderId(excludeOrderId);
         params.setReceiptStatusArr(receiptStatusArr);