guomengjiao месяцев назад: 3
Родитель
Сommit
128cee8985

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/subsidy/SubsidyCutInController.java

@@ -59,6 +59,7 @@ public class SubsidyCutInController extends BaseController {
      * 平台安排插队
      */
     @ApiOperation("平台安排插队")
+    @SaCheckPermission("subsidy:subsidyCutIn:cutIn")
     @PostMapping("/cutIn")
     public R<Void> cutIn(@Validated(AddGroup.class) @RequestBody SubsidyCutInSlimBo bo) {
         iSubsidyCutInService.cutIn(bo);
@@ -70,6 +71,7 @@ public class SubsidyCutInController extends BaseController {
      * 平台安排定额插队
      */
     @ApiOperation("平台安排定额插队")
+    @SaCheckPermission("subsidy:subsidyCutIn:fixedAmountCutIn")
     @PostMapping("/fixedAmountCutIn")
     public R<Void> fixedAmountCutIn(@Validated(AddGroup.class) @RequestBody FixedAmountCutInBo bo) {
         iSubsidyCutInService.fixedAmountCutIn(bo);

+ 2 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/subsidy/SubsidyQueueController.java

@@ -167,14 +167,13 @@ public class SubsidyQueueController extends BaseController {
     }
 
     /**
-     * 商家导出补贴排队列表
+     * 平台导出补贴排队列表
      */
-    @ApiOperation("商家导出补贴排队列表")
+    @ApiOperation("平台导出补贴排队列表")
     @SaCheckPermission("subsidy:subsidyQueue:export")
     @Log(title = "补贴排队", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(@Validated SubsidyQueueBo bo, HttpServletResponse response) {
-        bo.setCurrentBusinessId(getBusinessId( true));
         List<SubsidyQueueVo> list = iSubsidyQueueService.queryList(bo);
         ExcelUtil.exportExcel(list, "排队订单", SubsidyQueueVo.class, response);
     }

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -408,4 +408,4 @@ online-order:
   payExpireMinute: 30
   endOrderDay: 7
 
-
+authorizationLetterUrl: 2025/12/12/c778b429e92f48e1a8621fdf57ead6c5.docx

+ 10 - 0
ruoyi-api/src/main/java/com/ruoyi/api/controller/business/ApiBusinessController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,6 +49,8 @@ public class ApiBusinessController extends AbstractApiController {
     private final IBusinessCategoryService iBusinessCategoryService;
     private final ISysCnAreaService iSysCnAreaService;
     private final IShopSaleConfigService shopSaleConfigService;
+    @Value("${authorizationLetterUrl}")
+    protected String authorizationLetterUrl;
 
     /**
      * 查询商家分类列表
@@ -193,4 +196,11 @@ public class ApiBusinessController extends AbstractApiController {
         return R.ok(businessService.queryBusinessLimit(getBusinessByUserId(getUserId(true), true)));
     }
 
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("查询委托授权书模板URL")
+    @GetMapping("/queryAuthorizationTemplateUrl")
+    public R<String> queryAuthorizationTemplateUrl() {
+        return R.ok("成功", authorizationLetterUrl);
+    }
+
 }

+ 0 - 1
ruoyi-line/src/main/java/com/ruoyi/subsidy/domain/vo/SubsidyQueueVo.java

@@ -239,7 +239,6 @@ public class SubsidyQueueVo {
     /**
      * 订单来源
      */
-    @ExcelProperty(value = "订单来源")
     @ApiModelProperty(value = "订单来源")
     private PurchaseSource purchaseSource;