Browse Source

采美收款权限

chao 3 years ago
parent
commit
2360c59092

+ 12 - 1
backup.sql

@@ -117,7 +117,18 @@ CREATE TABLE `cm_receipt_type` (
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COMMENT='采美收款类型表';
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COMMENT='采美收款类型表';
 -- 初始数据
 -- 初始数据
-INSERT INTO `cm_receipt_permission`(`id`,`permission`) VALUES (1,'收款列表访问'),(2,'收款详情分享'),(3,'收款录入'),(4,'收款关联订单'),(5,'收款关联返佣'),(6,'收款关联供应商退款'),(7,'收款审核');
+INSERT INTO `cm_receipt_permission`(`id`,`permission`) VALUES
+(1,'录入收款'),
+(2,'收款列表操作'),
+(3,'关联订单款'),
+(4,'关联返佣款'),
+(5,'口头返佣'),
+(6,'关联供应商退款'),
+(7,'审核订单款'),
+(8,'收款详情分享'),
+(9,'订单款/非订单款详情查看'),
+(10,'返佣款详情查看'),
+(11,'供应商退款详情查看');
 INSERT INTO `cm_receipt_type`(`id`,`type`) VALUES (1,'建设银行-7297'),(2,'广发银行-0115'),(3,'中信银行-7172'),(4,'中信银行-0897'),(5,'中信银行-0897-财付通'),(6,'中信银行-0897-支付宝'),(7,'线上-支付宝'),(8,'线上-微信支付'),(9,'线上-快钱支付'),(10,'口头返佣'),(11,'广发银行-5461'),(12,'企业网银'),(13,'微信支付'),(14,'支付宝'),(15,'微信支付'),(16,'余额抵扣'),(18,'建设银行-1854'),(19,'建设银行-6256');
 INSERT INTO `cm_receipt_type`(`id`,`type`) VALUES (1,'建设银行-7297'),(2,'广发银行-0115'),(3,'中信银行-7172'),(4,'中信银行-0897'),(5,'中信银行-0897-财付通'),(6,'中信银行-0897-支付宝'),(7,'线上-支付宝'),(8,'线上-微信支付'),(9,'线上-快钱支付'),(10,'口头返佣'),(11,'广发银行-5461'),(12,'企业网银'),(13,'微信支付'),(14,'支付宝'),(15,'微信支付'),(16,'余额抵扣'),(18,'建设银行-1854'),(19,'建设银行-6256');
 
 
  -- 公众号微信用户列表
  -- 公众号微信用户列表

+ 3 - 0
src/main/java/com/caimei365/order/controller/ReceiptApi.java

@@ -160,6 +160,9 @@ public class ReceiptApi {
                                                             @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                             @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                                                             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                                                             @RequestHeader HttpHeaders headers) {
                                                             @RequestHeader HttpHeaders headers) {
+        if (null == receiptType || receiptType <= 0) {
+            return ResponseJson.error("款项类型不能为空", null);
+        }
         return receiptService.getReceiptList(receiptType, receiptStatus, smsContent, startDate, endDate, pageNum, pageSize, headers);
         return receiptService.getReceiptList(receiptType, receiptStatus, smsContent, startDate, endDate, pageNum, pageSize, headers);
     }
     }
 
 

+ 1 - 1
src/main/java/com/caimei365/order/mapper/ReceiptMapper.java

@@ -41,7 +41,7 @@ public interface ReceiptMapper {
      */
      */
     void updateOpenidByMobile(String openid, String unionId, String mobile);
     void updateOpenidByMobile(String openid, String unionId, String mobile);
     /**
     /**
-     * 获取用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+     * 获取用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
      */
      */
     List<Integer> getPermissionsByUserId(Integer userId);
     List<Integer> getPermissionsByUserId(Integer userId);
     /**
     /**

+ 4 - 4
src/main/java/com/caimei365/order/model/vo/ReceiptUserVo.java

@@ -46,14 +46,14 @@ public class ReceiptUserVo implements Serializable {
     @ApiModelProperty("密码")
     @ApiModelProperty("密码")
     private String password;
     private String password;
     /**
     /**
-     * 用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+     * 用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
      */
      */
-    @ApiModelProperty("用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核")
+    @ApiModelProperty("用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看")
     private Integer permission;
     private Integer permission;
     /**
     /**
-     * 用户权限列表: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+     * 用户权限列表: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
      */
      */
-    @ApiModelProperty("用户权限列表: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核")
+    @ApiModelProperty("用户权限列表: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看")
     private List<Integer> permissions;
     private List<Integer> permissions;
     /**
     /**
      * 微信unionId
      * 微信unionId

+ 58 - 56
src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -88,7 +88,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             // 收款用户
             // 收款用户
             ReceiptUserVo receiptUser = receiptMapper.getReceiptUserByOpenid(openid);
             ReceiptUserVo receiptUser = receiptMapper.getReceiptUserByOpenid(openid);
             if (null != receiptUser) {
             if (null != receiptUser) {
-                // 用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+                // 用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
                 List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
                 List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
                 receiptUser.setPermissions(permissions);
                 receiptUser.setPermissions(permissions);
                 return ResponseJson.success(receiptUser);
                 return ResponseJson.success(receiptUser);
@@ -137,7 +137,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 } else {
                 } else {
                     return ResponseJson.error(appletsInfo.getMsg(), null);
                     return ResponseJson.error(appletsInfo.getMsg(), null);
                 }
                 }
-                // 用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+                // 用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
                 List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
                 List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
                 receiptUser.setPermissions(permissions);
                 receiptUser.setPermissions(permissions);
                 return ResponseJson.success(receiptUser);
                 return ResponseJson.success(receiptUser);
@@ -162,8 +162,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<ReceiptVo> readSmsMessage(String smsContent, HttpHeaders headers) {
     public ResponseJson<ReceiptVo> readSmsMessage(String smsContent, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(3, headers);
+        // 检查收款用户权限:1录入收款
+        ReceiptUserVo receiptUser = checkPermissions(1, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -191,8 +191,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public ResponseJson<ReceiptPo> saveReceipt(ReceiptDto receiptDto, HttpHeaders headers) {
     public ResponseJson<ReceiptPo> saveReceipt(ReceiptDto receiptDto, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(3, headers);
+        // 检查收款用户权限:1录入收款
+        ReceiptUserVo receiptUser = checkPermissions(1, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -439,8 +439,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<ReceiptPo> operateReceipt(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
     public ResponseJson<ReceiptPo> operateReceipt(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(3, headers);
+        // 检查收款用户权限:2收款列表操作
+        ReceiptUserVo receiptUser = checkPermissions(2, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -483,6 +483,12 @@ public class ReceiptServiceImpl implements ReceiptService {
     /**
     /**
      * 获取收款列表
      * 获取收款列表
      *
      *
+     * 列表数据筛选:
+     * --超级管理员:无限制
+     * --协销:     非订单款,返佣款,与自身相关的订单款,与自身相关的供应商退款,
+     * --客服:     非订单款,返佣款,订单款
+     * --财务:      不能进入详情,操作权限可配置
+     *
      * @param receiptType   收款款项类型:1订单款,2非订单款,3返佣款 4订单款或者非订单款(因财务阶段无法区分订单非订单) 5供应商退款
      * @param receiptType   收款款项类型:1订单款,2非订单款,3返佣款 4订单款或者非订单款(因财务阶段无法区分订单非订单) 5供应商退款
      * @param receiptStatus 收款状态:1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
      * @param receiptStatus 收款状态:1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
      * @param smsContent    收款短信
      * @param smsContent    收款短信
@@ -494,7 +500,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Override
     @Override
     public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers) {
     public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers) {
         // 检查收款用户权限
         // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(1, headers);
+        ReceiptUserVo receiptUser = checkPermissions(0, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -509,24 +515,20 @@ public class ReceiptServiceImpl implements ReceiptService {
             }
             }
             paramsBo.setReceiptStatusArr(receiptStatusArr);
             paramsBo.setReceiptStatusArr(receiptStatusArr);
         }
         }
-        if (2 == receiptUser.getUserType()){
-            // 客服只能看到2待审核和3审核通过的订单款
-            if (null == receiptStatus || receiptStatus == 0){
-                paramsBo.setReceiptStatusArr("2,3".split(","));
-            } else if (!(2 == receiptStatus || 3 == receiptStatus)) {
-                return ResponseJson.success(emptyInfo);
+        if (1 == receiptUser.getUserType()) {
+            // 协销:非订单款,返佣款,与自身相关的订单款,与自身相关的供应商退款
+            if(1 == receiptType || 5 == receiptType) {
+                // 获取该协销收款用户下的机构userIds
+                Integer spId = receiptMapper.getServiceProviderId(receiptUser.getUnionId());
+                List<Integer> clubUserIds = receiptMapper.getClubUserIdBySpId(spId);
+                paramsBo.setUserIds(clubUserIds);
             }
             }
-        } else if (1 == receiptUser.getUserType()) {
-            //协销人员不能能看到(2已确认(待审核)) 且 非自己名下机构的款项
-            if (null == receiptStatus || receiptStatus == 0){
-                paramsBo.setReceiptStatusArr("1,3,4,5".split(","));
-            } else if (2 == receiptStatus){
+        } else if (2 == receiptUser.getUserType()) {
+            //客服: 非订单款,返佣款,订单款
+            if (5 == receiptType) {
+                // 不能查看供应商退款
                 return ResponseJson.success(emptyInfo);
                 return ResponseJson.success(emptyInfo);
             }
             }
-            // 获取该协销收款用户下的机构userIds
-            Integer spId = receiptMapper.getServiceProviderId(receiptUser.getUnionId());
-            List<Integer> clubUserIds = receiptMapper.getClubUserIdBySpId(spId);
-            paramsBo.setUserIds(clubUserIds);
         }
         }
         if (StringUtils.isNotBlank(smsContent)) {
         if (StringUtils.isNotBlank(smsContent)) {
             // 短信内容隐藏余额
             // 短信内容隐藏余额
@@ -555,8 +557,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers) {
     public ResponseJson<ReceiptVo> getReceiptDetail(Integer id, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(4, headers);
+        // 检查收款用户权限:9订单款/非订单款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(9, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -610,7 +612,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<Map<String, Integer>> getReceiptDetailType(Integer id, HttpHeaders headers) {
     public ResponseJson<Map<String, Integer>> getReceiptDetailType(Integer id, HttpHeaders headers) {
-        // 检查收款用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+        // 检查收款用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
         ReceiptUserVo receiptUser = checkPermissions(0, headers);
         ReceiptUserVo receiptUser = checkPermissions(0, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
@@ -632,8 +634,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<ReceiptVo> getReceiptDetailShare(Integer id, HttpHeaders headers) {
     public ResponseJson<ReceiptVo> getReceiptDetailShare(Integer id, HttpHeaders headers) {
-        // 检查收款用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
-        ReceiptUserVo receiptUser = checkPermissions(2, headers);
+        // 检查收款用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(8, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -649,8 +651,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, HttpHeaders headers) {
     public ResponseJson<ReceiptVo> getReceiptRefundDetail(Integer id, HttpHeaders headers) {
-        // 检查收款用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
-        ReceiptUserVo receiptUser = checkPermissions(6, headers);
+        // 检查收款用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(11, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -666,8 +668,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<ReceiptVo> getReceiptRebateDetail(Integer id, HttpHeaders headers) {
     public ResponseJson<ReceiptVo> getReceiptRebateDetail(Integer id, HttpHeaders headers) {
-        // 检查收款用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
-        ReceiptUserVo receiptUser = checkPermissions(5, headers);
+        // 检查收款用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(10, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -690,8 +692,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword, int pageNum, int pageSize, HttpHeaders headers) {
     public ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword, int pageNum, int pageSize, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(4, headers);
+        // 检查收款用户权限:9订单款/非订单款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(9, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -798,8 +800,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<OrderVo> getReceiptOrderInfo(Integer orderId, HttpHeaders headers) {
     public ResponseJson<OrderVo> getReceiptOrderInfo(Integer orderId, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(4, headers);
+        // 检查收款用户权限:9订单款/非订单款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(9, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -841,8 +843,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String keyword, int pageNum, int pageSize, HttpHeaders headers) {
     public ResponseJson<PageInfo<ShopOrderVo>> getRefundShopOrderList(Integer id, Integer confirmedType, String shopName, String keyword, int pageNum, int pageSize, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(6, headers);
+        // 检查收款用户权限:11供应商退款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(11, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -885,8 +887,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<OrderVo> getRefundShopOrderInfo(Integer orderId, HttpHeaders headers) {
     public ResponseJson<OrderVo> getRefundShopOrderInfo(Integer orderId, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(6, headers);
+        // 检查收款用户权限:11供应商退款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(11, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -947,8 +949,8 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
      */
     @Override
     @Override
     public ResponseJson<PageInfo<ShopOrderVo>> getRebateShopOrderList(Integer id, String shopName, int pageNum, int pageSize, HttpHeaders headers) {
     public ResponseJson<PageInfo<ShopOrderVo>> getRebateShopOrderList(Integer id, String shopName, int pageNum, int pageSize, HttpHeaders headers) {
-        // 检查收款用户权限
-        ReceiptUserVo receiptUser = checkPermissions(5, headers);
+        // 检查收款用户权限:10返佣款详情查看
+        ReceiptUserVo receiptUser = checkPermissions(10, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -985,8 +987,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public ResponseJson<Void> receiptAssociate(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
     public ResponseJson<Void> receiptAssociate(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
-        // 检查收款用户权限: 4收款关联订单
-        ReceiptUserVo receiptUser = checkPermissions(4, headers);
+        // 检查收款用户权限: 3关联订单款
+        ReceiptUserVo receiptUser = checkPermissions(3, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -1168,7 +1170,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         receiptPo.setConfirmDate(time);
         receiptPo.setConfirmDate(time);
         receiptMapper.updateReceipt(receiptPo);
         receiptMapper.updateReceipt(receiptPo);
 
 
-        // 关联成功推送模板消息给指定人员(用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+        // 关联成功推送模板消息给指定人员(用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
         try {
         try {
             String accessToken = weChatService.getAccessToken();
             String accessToken = weChatService.getAccessToken();
             List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(7));
             List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(7));
@@ -1201,7 +1203,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public ResponseJson<Void> receiptAssociateRefund(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
     public ResponseJson<Void> receiptAssociateRefund(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
-        // 检查收款用户权限: 6收款关联供应商退款
+        // 检查收款用户权限: 6关联供应商退款
         ReceiptUserVo receiptUser = checkPermissions(6, headers);
         ReceiptUserVo receiptUser = checkPermissions(6, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
@@ -1294,8 +1296,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public ResponseJson<Void> receiptAssociateRebate(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
     public ResponseJson<Void> receiptAssociateRebate(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
-        // 检查收款用户权限: 5收款关联返佣
-        ReceiptUserVo receiptUser = checkPermissions(5, headers);
+        // 检查收款用户权限: 4关联返佣款
+        ReceiptUserVo receiptUser = checkPermissions(4, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
         }
         }
@@ -1340,7 +1342,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public ResponseJson<Integer> associateVerbalRebate(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
     public ResponseJson<Integer> associateVerbalRebate(ReceiptOperateDto receiptOperateDto, HttpHeaders headers) {
-        // 检查收款用户权限: 5收款关联返佣
+        // 检查收款用户权限: 5关联口头返佣
         ReceiptUserVo receiptUser = checkPermissions(5, headers);
         ReceiptUserVo receiptUser = checkPermissions(5, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
@@ -1441,7 +1443,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public ResponseJson<Void> receiptAudit(Integer id, Integer receiptStatus, String reviewReason, HttpHeaders headers) {
     public ResponseJson<Void> receiptAudit(Integer id, Integer receiptStatus, String reviewReason, HttpHeaders headers) {
-        // 检查收款用户权限: 7收款审核
+        // 检查收款用户权限: 7审核订单款
         ReceiptUserVo receiptUser = checkPermissions(7, headers);
         ReceiptUserVo receiptUser = checkPermissions(7, headers);
         if (null == receiptUser) {
         if (null == receiptUser) {
             return ResponseJson.error("无权限操作!", null);
             return ResponseJson.error("无权限操作!", null);
@@ -1687,7 +1689,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                 String receiptTypeStr = receiptMapper.getReceiptTypeStrById(receiptPo.getPayType());
                 String receiptTypeStr = receiptMapper.getReceiptTypeStrById(receiptPo.getPayType());
                 String remarkText = "收款类型:"+ receiptTypeStr +";"+"审核时间:"+receiptPo.getReviewDate();
                 String remarkText = "收款类型:"+ receiptTypeStr +";"+"审核时间:"+receiptPo.getReviewDate();
                 double associateAmount = receiptMapper.countAssociateAmountById(receiptPo.getId());
                 double associateAmount = receiptMapper.countAssociateAmountById(receiptPo.getId());
-                // (用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+                // (用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
                 List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(4));
                 List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(4));
                 openidList.removeIf(Objects::isNull);
                 openidList.removeIf(Objects::isNull);
                 // 跳转到【普通款项待审核】页面
                 // 跳转到【普通款项待审核】页面
@@ -1715,7 +1717,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         paramsBo.setStartDate("2022-01-01 00:00:00");
         paramsBo.setStartDate("2022-01-01 00:00:00");
         List<ReceiptVo> list = receiptMapper.getReceiptList(paramsBo);
         List<ReceiptVo> list = receiptMapper.getReceiptList(paramsBo);
         list.removeIf(Objects::isNull);
         list.removeIf(Objects::isNull);
-        // (用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+        // (用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
         List<String> openidList = receiptMapper.getOpenidListByPermission(Arrays.asList(4,5,6));
         List<String> openidList = receiptMapper.getOpenidListByPermission(Arrays.asList(4,5,6));
         openidList.removeIf(Objects::isNull);
         openidList.removeIf(Objects::isNull);
         String title = "超时未确认,请及时查看详情并确认关联!";
         String title = "超时未确认,请及时查看详情并确认关联!";
@@ -1744,7 +1746,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         paramsBo.setStartDate("2022-01-01 00:00:00");
         paramsBo.setStartDate("2022-01-01 00:00:00");
         List<ReceiptVo> list = receiptMapper.getReceiptList(paramsBo);
         List<ReceiptVo> list = receiptMapper.getReceiptList(paramsBo);
         list.removeIf(Objects::isNull);
         list.removeIf(Objects::isNull);
-        // (用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+        // (用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
         List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(7));
         List<String> openidList = receiptMapper.getOpenidListByPermission(Collections.singletonList(7));
         openidList.removeIf(Objects::isNull);
         openidList.removeIf(Objects::isNull);
         String title = "超时未审核,请及时查看详情并审核!";
         String title = "超时未审核,请及时查看详情并审核!";
@@ -1877,7 +1879,7 @@ public class ReceiptServiceImpl implements ReceiptService {
 
 
     /**
     /**
      * 检查收款权限
      * 检查收款权限
-     * 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+     * 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
      *
      *
      * @param permission 0:登录用户不需要权限,其他具体权限
      * @param permission 0:登录用户不需要权限,其他具体权限
      * @param headers    HttpHeaders
      * @param headers    HttpHeaders
@@ -1890,7 +1892,7 @@ public class ReceiptServiceImpl implements ReceiptService {
             // 收款用户
             // 收款用户
             ReceiptUserVo receiptUser = receiptMapper.getReceiptUserByOpenid(openid);
             ReceiptUserVo receiptUser = receiptMapper.getReceiptUserByOpenid(openid);
             if (null != receiptUser) {
             if (null != receiptUser) {
-                // 获取用户权限: 1收款列表访问,2收款详情分享,3收款录入,4收款关联订单,5收款关联返佣,6收款关联供应商退款,7收款审核
+                // 获取用户权限: 1录入收款,2收款列表操作,3关联订单款,4关联返佣款,5口头返佣,6关联供应商退款,7审核订单款,8收款详情分享,9订单款/非订单款详情查看,10返佣款详情查看,11供应商退款详情查看
                 List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
                 List<Integer> permissions = receiptMapper.getPermissionsByUserId(receiptUser.getId());
                 if (0 == permission || permissions.contains(permission)) {
                 if (0 == permission || permissions.contains(permission)) {
                     receiptUser.setPermissions(permissions);
                     receiptUser.setPermissions(permissions);