gongfuzhu hace 5 meses
padre
commit
e68dba746b

+ 8 - 8
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/OrderController.java

@@ -195,8 +195,8 @@ public class OrderController {
 
 
     @ApiOperation("商家验券")
-    @ResourceAuth(value = "checkCoupon", type = AuthType.Enterprise)
-    @ResourceAuth(value = "checkCoupon", type = AuthType.Project)
+    @ResourceAuth(value = {"checkCoupon","272"}, type = AuthType.Enterprise)
+    @ResourceAuth(value = {"checkCoupon","272"}, type = AuthType.Project)
     @RequestMapping(value = "shop/verification/{token}", method = RequestMethod.GET, consumes = {MediaType.ALL_VALUE})
     public ResultContent verification(@PathVariable("token") String token) {
 
@@ -237,8 +237,8 @@ public class OrderController {
 
     @ApiOperation("商家_订单查询列表")
     @RequestMapping(value = "shop/search", method = RequestMethod.POST)
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @ResourceAuth(value = {"admin","267"}, type = AuthType.Enterprise)
+    @ResourceAuth(value = {"admin","267"}, type = AuthType.Project)
     @Code
     public ResultContent<Page<OrderResult2Model>> shopSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
         return orderServiceImp.shopSearch(seachOrderModel);
@@ -247,8 +247,8 @@ public class OrderController {
 
     @ApiOperation("商家_小程序订单查询列表")
     @RequestMapping(value = "shop/wechat/search", method = RequestMethod.POST)
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @ResourceAuth(value = {"admin","267"}, type = AuthType.Enterprise)
+    @ResourceAuth(value = {"admin","267"}, type = AuthType.Project)
     @Code
     public ResultContent<Page<OrderResult2Model>> shopWechatSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
         return orderServiceImp.adminWeChatSearch(seachOrderModel);
@@ -256,8 +256,8 @@ public class OrderController {
 
     @ApiOperation("商家_订单详情")
     @RequestMapping(value = "shop/orderDetail/{orderNo}", method = RequestMethod.GET)
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @ResourceAuth(value =  {"admin","267"}, type = AuthType.Enterprise)
+    @ResourceAuth(value =  {"admin","267"}, type = AuthType.Project)
     public ResultContent shopOrderDetail(@PathVariable("orderNo") String orderNo) {
         return orderServiceImp.shopOrderDetail(orderNo);
     }

+ 8 - 8
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/PaymentController.java

@@ -92,8 +92,8 @@ public class PaymentController {
 
     @ApiOperation("退款审核")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @ResourceAuth(value = {"admin", "276"}, type = AuthType.Enterprise)
+    @ResourceAuth(value = {"admin", "276"}, type = AuthType.Project)
     @RequestMapping(value = "auditRefund", method = RequestMethod.POST)
     public ResultContent auditRefund(@RequestBody @Valid RefundParam2Model refundParam2Model) {
         return paymentServer.auditRefund(refundParam2Model);
@@ -132,7 +132,7 @@ public class PaymentController {
     @ResourceAuth(value = "admin", type = AuthType.Project)
     @RequestMapping(value = "account/getDetail", method = RequestMethod.GET)
     public ResultContent getDetail(com.zhongshu.payment.client.model.Code code) {
-        Assert.hasText(code.getCode(),"code 不能为空");
+        Assert.hasText(code.getCode(), "code 不能为空");
         return paymentServer.getDetail(code);
     }
 
@@ -145,11 +145,11 @@ public class PaymentController {
 
 
     @ApiOperation("店铺_提现按钮")
-    @ResourceAuth(value = "admin", type = AuthType.Enterprise)
-    @ResourceAuth(value = "admin", type = AuthType.Project)
+    @ResourceAuth(value = {"admin", "270"}, type = AuthType.Enterprise)
+    @ResourceAuth(value = {"admin", "270"}, type = AuthType.Project)
     @RequestMapping(value = "account/withdrawals", method = RequestMethod.POST)
     public ResultContent withdrawals(@RequestBody AccountModel applyWithdrawalsModel) {
-        Assert.hasText(applyWithdrawalsModel.getCode(),"code 不能为空");
+        Assert.hasText(applyWithdrawalsModel.getCode(), "code 不能为空");
         return paymentServer.applicationShopWithdrawals(applyWithdrawalsModel);
     }
 
@@ -166,7 +166,7 @@ public class PaymentController {
     @ResourceAuth(value = "admin", type = AuthType.Project)
     @RequestMapping(value = "account/withdrawals/list", method = RequestMethod.POST)
     public ResultContent withdrawalsOrderList(@RequestBody @Valid WithdrawRequestModel withdrawRequestModel) {
-        Assert.hasText(withdrawRequestModel.getCode(),"code 不能为空");
+        Assert.hasText(withdrawRequestModel.getCode(), "code 不能为空");
         return paymentServer.withdrawalsOrderList(withdrawRequestModel);
     }
 
@@ -182,7 +182,7 @@ public class PaymentController {
     @ResourceAuth(value = "admin", type = AuthType.Project)
     @RequestMapping(value = "account/shop/withdrawedList", method = RequestMethod.POST)
     public ResultContent<Page<WithdrawListModel>> withdrawedList(@RequestBody @Valid WithdrawedRequestModel withdrawRequestModel) {
-        Assert.hasText(withdrawRequestModel.getCode(),"code 不能为空");
+        Assert.hasText(withdrawRequestModel.getCode(), "code 不能为空");
         return paymentServer.withdrawedList(withdrawRequestModel);
     }