bugfix

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

@@ -547,7 +547,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         // 订单款
         if (1 == receiptType) {
             // 检查收款用户权限：10订单款查看(全部)，13订单款查看(协销自己机构),16订单款查看(协销小组机构)
-            receiptUser = checkPermissions(Arrays.asList(10, 13,16), headers);
+            receiptUser = checkPermissions(Arrays.asList(10, 13, 16), headers);
             if (null == receiptUser) {
                 return ResponseJson.error("无权限操作！", null);
             }
@@ -558,7 +558,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 List<Integer> clubUserIds = getClubUserIds(receiptUser);
                 paramsBo.setUserIds(clubUserIds);
             }
-            if(!permissions.contains(10) && permissions.contains(16)){
+            if (!permissions.contains(10) && permissions.contains(16)) {
                 //获取该协销小组下所有的userId
                 List<Integer> clubUserIds = getTeamClubUserIds(receiptUser);
                 paramsBo.setUserIds(clubUserIds);
@@ -586,7 +586,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 List<Integer> clubUserIds = getClubUserIds(receiptUser);
                 paramsBo.setUserIds(clubUserIds);
             }
-            if(!permissions.contains(11) && permissions.contains(17)){
+            if (!permissions.contains(11) && permissions.contains(17)) {
                 List<Integer> clubUserIds = getTeamClubUserIds(receiptUser);
                 paramsBo.setUserIds(clubUserIds);
             }
@@ -594,7 +594,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         // 供应商退款
         else if (5 == receiptType) {
             // 检查收款用户权限: 12供应商退款查看(全部)，15供应商退款查看(协销自己机构),18,供应商退款查看(协销小组机构)
-            receiptUser = checkPermissions(Arrays.asList(12, 15,18), headers);
+            receiptUser = checkPermissions(Arrays.asList(12, 15, 18), headers);
             if (null == receiptUser) {
                 return ResponseJson.error("无权限操作！", null);
             }
@@ -605,7 +605,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 List<Integer> clubUserIds = getClubUserIds(receiptUser);
                 paramsBo.setUserIds(clubUserIds);
             }
-            if(!permissions.contains(12) && permissions.contains(18)){
+            if (!permissions.contains(12) && permissions.contains(18)) {
                 // 获取该协销收款用户下的机构userIds
                 List<Integer> clubUserIds = getTeamClubUserIds(receiptUser);
                 paramsBo.setUserIds(clubUserIds);
@@ -635,11 +635,11 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     private List<Integer> getTeamClubUserIds(ReceiptUserVo receiptUser) {
         List<Integer> clubUserIds = null;
-        if(1==receiptUser.getUserType()){
+        if (1 == receiptUser.getUserType()) {
             // 获取该协销收款用户下的机构userIds
             Integer spId = receiptMapper.getServiceProviderId(receiptUser.getUnionId());
             clubUserIds = receiptMapper.getTeamClubUserIdBySpId(spId);
-            if(null == clubUserIds || CollectionUtils.isEmpty(clubUserIds)){
+            if (null == clubUserIds || CollectionUtils.isEmpty(clubUserIds)) {
                 clubUserIds = new ArrayList<>();
                 clubUserIds.add(0);
             }
@@ -671,11 +671,11 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
     @Override
     public ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers) {
-        // 检查收款用户权限：9非订单款查看(全部)，10订单款查看(全部)，13订单款查看(协销自己机构)
-        ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(9, 10, 13), headers);
-        if (null == receiptUser) {
-            return ResponseJson.error("无权限操作！", null);
-        }
+        // 检查收款用户权限：9非订单款查看(全部)，10订单款查看(全部)，13订单款查看(协销自己机构),16订单款查看(协销小组机构)
+        ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(9, 10, 13, 16), headers);
+//        if (null == receiptUser) {
+//            return ResponseJson.error("无权限操作！", null);
+//        }
         //改为独立权限，有详情查看权限才能看     19,款项详情查看
         ReceiptUserVo receiptCheck = checkPermissions(Arrays.asList(19), headers);
         if (null == receiptCheck) {
@@ -819,8 +819,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
     @Override
     public ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword, int pageNum, int pageSize, HttpHeaders headers) {
-        // 检查收款用户权限：10订单款查看(全部)，13订单款查看(协销自己机构)
-        ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(10, 13), headers);
+        // 检查收款用户权限：10订单款查看(全部)，13订单款查看(协销自己机构),16订单款查看(协销小组机构)
+        ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(10, 13, 16), headers);
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作！", null);
         }
@@ -920,8 +920,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
     @Override
     public ResponseJson<OrderVo> getReceiptOrderInfo(Integer orderId, HttpHeaders headers) {
-        // 检查收款用户权限：10订单款查看(全部)，13订单款查看(协销自己机构)
-        ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(10, 13), headers);
+        // 检查收款用户权限：10订单款查看(全部)，13订单款查看(协销自己机构),16订单款查看(协销小组机构)
+        ReceiptUserVo receiptUser = checkPermissions(Arrays.asList(10, 13, 16), headers);
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作！", null);
         }