dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessDayBillController.java

@@ -137,13 +137,25 @@ public class BusinessDayBillController extends BaseController {
     }
 
 
+
+    /**
+     * 平台获取商家日账单统计信息
+     */
+    @ApiOperation("平台获取商家日账单统计信息")
+    @SaCheckPermission("businessDayBill:businessDayBill:getStatistics")
+    @GetMapping("/getStatistics")
+    public R<BusinessDayBillVo> getStatistics(@Validated BusinessDayBillCountBo bo) {
+        bo.setBusinessId(getBusinessId( true));
+        return R.ok(iBusinessDayBillService.getStatistics(bo));
+    }
+
     /**
      * 商家获取商家日账单统计信息
      */
     @ApiOperation("商家获取商家日账单统计信息")
     @SaCheckPermission("businessDayBill:businessDayBill:businessGetStatistics")
     @GetMapping("/business-getStatistics")
-    public R<BusinessDayBillVo> getStatistics(@Validated BusinessDayBillCountBo bo) {
+    public R<BusinessDayBillVo> getBusinessStatistics(@Validated BusinessDayBillCountBo bo) {
         bo.setBusinessId(getBusinessId( true));
         return R.ok(iBusinessDayBillService.getStatistics(bo));
     }

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

@@ -88,42 +88,7 @@ public class SubsidyCutInController extends BaseController {
         return R.ok(iSubsidyCutInService.queryById(cutInId));
     }
 
-    /**
-     * 新增补贴插队
-     */
-    @ApiOperation("新增补贴插队")
-    @SaCheckPermission("subsidy:subsidyCutIn:add")
-    @Log(title = "补贴插队", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping("/add")
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SubsidyCutInBo bo) {
-        return toAjax(iSubsidyCutInService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改补贴插队
-     */
-    @ApiOperation("修改补贴插队")
-    @SaCheckPermission("subsidy:subsidyCutIn:edit")
-    @Log(title = "补贴插队", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PostMapping("/edit")
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SubsidyCutInBo bo) {
-        return toAjax(iSubsidyCutInService.updateByBo(bo) ? 1 : 0);
-    }
 
-    /**
-     * 删除补贴插队
-     */
-    @ApiOperation("删除补贴插队")
-    @SaCheckPermission("subsidy:subsidyCutIn:remove")
-    @Log(title = "补贴插队", businessType = BusinessType.DELETE)
-    @PostMapping("/del/{cutInIds}")
-    public R<Void> remove(@ApiParam("主键串")
-                                       @NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] cutInIds) {
-        return toAjax(iSubsidyCutInService.deleteWithValidByIds(Arrays.asList(cutInIds), true) ? 1 : 0);
-    }
 
     /**
      * 导出补贴插队列表

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -732,6 +732,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         return this.baseMapper.getSubsidyAmount(businessId,countType.getCode());
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public List<SubsidyQueueImportBo> importData(Long businessId,List<SubsidyQueueImportBo> validList) {
         Business business = businessService.loadById(businessId, true);