权限

trade-admin/src/main/java/com/trade/admin/business/separateaccounts/controller/SeparateAccountsController.java

@@ -46,22 +46,36 @@ public class SeparateAccountsController {
      */
     @ApiOperation(value = "获取分账分页", notes = "获取分账分页")
     @PostMapping("/get/page")
-    @PreAuthorize("@ss.hasPermi('business.separateaccounts:pages')")
+    @PreAuthorize("@ss.hasPermi('business:separate:all')")
     public ResponseResult<GridPage<SeparateAccountsPageVo>> getSeparateAccountsPage(
             @RequestBody SeparateAccountsSearchDto searchDto) {
         return ResponseResult.success(separateAccountsService.queryListByPage(searchDto));
     }
 
+    /**
+     * 获取分账列表分页信息
+     *
+     * @param searchDto 分账列表分页信息条件
+     * @return 分账列表分页信息
+     */
+    @ApiOperation(value = "获取分账分页", notes = "获取分账分页")
+    @PostMapping("/get/pedingPage")
+    @PreAuthorize("@ss.hasPermi('business:separate:peding')")
+    public ResponseResult<GridPage<SeparateAccountsPageVo>> getSeparateAccountsPedingPage(
+            @RequestBody SeparateAccountsSearchDto searchDto) {
+        return ResponseResult.success(separateAccountsService.queryListByPage(searchDto));
+    }
+
     @ApiOperation(value = "获取分账提交页面", notes = "获取分账提交页面")
     @GetMapping("/get/submitPage")
-    @PreAuthorize("@ss.hasPermi('business.separateaccounts:query')")
+    @PreAuthorize("@ss.hasPermi('business:separate:edit')")
     public ResponseResult<SeparateAccountsSubmitVo> querySubmitSeparateAccounts(Long id) {
         return ResponseResult.success(separateAccountsService.querySubmitSeparateAccounts(id));
     }
 
     @ApiOperation(value = "分账提交", notes = "分账提交")
     @PostMapping("/submit")
-    @PreAuthorize("@ss.hasPermi('business.separateaccounts:submit')")
+    // @PreAuthorize("@ss.hasPermi('business:separateaccounts:submit')")
     public ResponseResult<Boolean> submitSeparateAccounts(
             @RequestBody @Validated List<SubmitSeparateAccountsDto> separateAccountsDto) {
         return ResponseResult.success(separateAccountsService.submitSeparateAccounts(separateAccountsDto));
@@ -69,7 +83,7 @@ public class SeparateAccountsController {
 
     @ApiOperation(value = "获取分账详情页面", notes = "获取分账详情页面")
     @GetMapping("/get/detail")
-    @PreAuthorize("@ss.hasPermi('business.separateaccounts:detail')")
+    @PreAuthorize("@ss.hasPermi('business:separate:view')")
     public ResponseResult<SeparateAccountsDetailVo> querySeparateAccountsDetail(Long id) {
         return ResponseResult.success(separateAccountsService.querySeparateAccountsDetail(id));
     }

trade-admin/src/main/java/com/trade/admin/finance/paymentcollection/controller/BPaymentCollectionController.java

@@ -50,7 +50,7 @@ public class BPaymentCollectionController {
      */
     @ApiOperation(value = "获取入账分页", notes = "获取入账分页")
     @PostMapping("/get/entryPage")
-    @PreAuthorize("@ss.hasPermi('paymentCollection:entry:pages')")
+    @PreAuthorize("@ss.hasPermi('financial:entryAndExit:entry')")
     public ResponseResult<GridPage<BillingIncomePageVo>> getEntryPage(
             @RequestBody BillingIncomeSearchDto incomeSearchDto) {
         return ResponseResult.success(paymentCollectionService.queryListByPage(incomeSearchDto));
@@ -102,7 +102,7 @@ public class BPaymentCollectionController {
      */
     @ApiOperation(value = "提交入账申请审核", notes = "提交入账申请审核")
     @PostMapping("/submit/entryReview")
-    @PreAuthorize("@ss.hasPermi('paymentCollection:submit:entryReview')")
+    @PreAuthorize("@ss.hasPermi('financial:entryAndExit:entryAudit')")
     public ResponseResult<Boolean> submitEntryReview(@RequestBody @Validated EntryReviewDto entryReviewDto) {
         return ResponseResult.success(paymentCollectionService.submitEntryReview(entryReviewDto));
     }
@@ -114,7 +114,7 @@ public class BPaymentCollectionController {
      */
     @ApiOperation(value = "获取入账详情", notes = "获取入账详情")
     @GetMapping("/get/billingIncomeDetail")
-    @PreAuthorize("@ss.hasPermi('paymentCollection:entry:detail')")
+    @PreAuthorize("@ss.hasPermi('financial:entryAndExit:entryDetail')")
     public ResponseResult<BillingIncomeDetailDto> getBillingIncomeDetail(Long id) {
         return ResponseResult.success(paymentCollectionService.getBillingIncomeDetail(id));
     }
@@ -142,7 +142,7 @@ public class BPaymentCollectionController {
      */
     @ApiOperation(value = "获取出账分页", notes = "获取出账分页")
     @PostMapping("/get/disbursementPage")
-    @PreAuthorize("@ss.hasPermi('paymentCollection:disbursement:pages')")
+    @PreAuthorize("@ss.hasPermi('financial:entryAndExit:exit')")
     public ResponseResult<GridPage<BillingDisbursementPageVo>> getDisbursementPage(
             @RequestBody DisbursementSearchDto searchDto) {
         return ResponseResult.success(billingDisbursementService.queryListByPage(searchDto));
@@ -156,7 +156,7 @@ public class BPaymentCollectionController {
      */
     @ApiOperation(value = "提交出账确认", notes = "提交出账确认")
     @PostMapping("/submit/disbursementConfirmed")
-    @PreAuthorize("@ss.hasPermi('paymentCollection:submit:disbursementConfirmed')")
+    @PreAuthorize("@ss.hasPermi('financial:entryAndExit:exitConfirm')")
     public ResponseResult<Boolean> confirmedDisbursement(
             @RequestBody @Valid ConfirmedDisbursementDto confirmedDisbursementDto) {
         return ResponseResult.success(billingDisbursementService.confirmedDisbursement(confirmedDisbursementDto));
@@ -169,7 +169,7 @@ public class BPaymentCollectionController {
      */
     @ApiOperation(value = "获取出账详情", notes = "获取出账详情")
     @GetMapping("/get/disbursementDetail")
-    @PreAuthorize("@ss.hasPermi('paymentCollection:disbursement:detail')")
+    @PreAuthorize("@ss.hasPermi('financial:entryAndExit:exitDetail')")
     public ResponseResult<BillingDisbursementDetail> getDisbursementDetail(Long id) {
         return ResponseResult.success(billingDisbursementService.queryDetailV2(id));
     }

trade-admin/src/main/java/com/trade/admin/trade/salesorder/SalesOrderBController.java

@@ -64,7 +64,7 @@ public class SalesOrderBController {
      */
     @ApiOperation(value = "商品列表提示收款", notes = "商品列表提示收款")
     @PostMapping("/goodsReceivePayment")
-    @PreAuthorize("@ss.hasPermi('trade:salesOrder:goodsReceivePayment')")
+    // @PreAuthorize("@ss.hasPermi('trade:salesOrder:goodsReceivePayment')")
     public ResponseResult<Boolean> processGoodsReceivePayment(
             @RequestBody @Valid SalesGoodsReceivePaymentDto salesOrderReceivePayment) {
         return ResponseResult.success(salesOrderService.processGoodsReceivePayment(salesOrderReceivePayment));
@@ -75,7 +75,7 @@ public class SalesOrderBController {
      */
     @ApiOperation(value = "确认收款(处理订单收款列表)", notes = "确认收款(处理订单收款列表)")
     @PostMapping("/processOrderReceivePaymentLis")
-    @PreAuthorize("@ss.hasPermi('trade:salesOrder:processOrderReceivePaymentList')")
+    @PreAuthorize("@ss.hasPermi('trade:salesOrder:remind')")
     public ResponseResult<List<ReceivePaymentExtendDto>> processOrderReceivePaymentList(
             @RequestBody @Valid List<ReceivePaymentExtendDto> receivePaymentExtendDtos) {
         return ResponseResult.success(salesOrderService.processOrderReceivePaymentList(receivePaymentExtendDtos, true));