修改 接口 权限判断标识

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @date 2020-12-11
  */
 @RestController
-@RequestMapping("/basicdata/customerDetails/corps")
+@RequestMapping("/basicdata/corps")
 public class TCorpsController extends BaseController {
     @Autowired
     private ITCorpsService tCorpsService;
@@ -37,7 +37,7 @@ public class TCorpsController extends BaseController {
     /**
      * 查询客户详情列表
      */
-    @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:list')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:list')")
     @GetMapping("/list")
     public TableDataInfo list(TCorps tCorps) {
         startPage();
@@ -48,7 +48,7 @@ public class TCorpsController extends BaseController {
     /**
      * 导出客户详情列表
      */
-    @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:export')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:export')")
     @Log(title = "客户详情", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TCorps tCorps) {
@@ -60,7 +60,7 @@ public class TCorpsController extends BaseController {
     /**
      * 获取客户详情详细信息
      */
-    @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:query')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(tCorpsService.selectTCorpsById(fId));
@@ -69,7 +69,7 @@ public class TCorpsController extends BaseController {
     /**
      * 新增客户详情
      */
-    @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:add')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:add')")
     @Log(title = "客户详情", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
@@ -91,7 +91,7 @@ public class TCorpsController extends BaseController {
     /**
      * 修改客户详情basicdata/customerDetails/corps
      */
-    @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:edit')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:edit')")
     @Log(title = "客户详情", businessType = BusinessType.UPDATE)
     @PutMapping
     @RepeatSubmit
@@ -102,7 +102,7 @@ public class TCorpsController extends BaseController {
     /**
      * 删除客户详情
      */
-    @PreAuthorize("@ss.hasPermi('basicdata/customerDetails:corps:remove')")
+    @PreAuthorize("@ss.hasPermi('basicdata:corps:remove')")
     @Log(title = "客户详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     @RepeatSubmit

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -466,26 +466,27 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             String information = "";
 
             if (days >= dayLength) {
-                information = (tWarehouseAgreementitems.getfEndays() - tWarehouseAgreementitems.getfFromdays())
-                        + "天X" + tWarehouseAgreementitems.getfPrice() + "元";
+                feeId = tWarehouseAgreementitems.getfFeeid();
+                BigDecimal calculate = this.getCalculate(itemNums, tWarehouseAgreementitems.getfPrice(), dayLength);
+                money = money.add(calculate);
+                days = days - dayLength;
+                information = dayLength + "天*" + tWarehouseAgreementitems.getfPrice() + "元*" + itemNums + "元 = " + calculate + "元";
                 if (StringUtils.isEmpty(remark)) {
                     remark = information;
                 } else {
                     remark = remark + "," + information;
                 }
-                feeId = tWarehouseAgreementitems.getfFeeid();
-                money = money.add(this.getCalculate(itemNums,tWarehouseAgreementitems.getfPrice(),dayLength));
-                days = days - dayLength;
             } else {
+                feeId = tWarehouseAgreementitems.getfFeeid();
+                BigDecimal calculate = this.getCalculate(itemNums, tWarehouseAgreementitems.getfPrice(), days);
+                money = money.add(calculate);
                 long day = days - tWarehouseAgreementitems.getfFromdays();
-                information =  day + "天X" + tWarehouseAgreementitems.getfPrice() + "元";
+                information =  day + "天*" + tWarehouseAgreementitems.getfPrice() + "元*" + itemNums + "元 = " + calculate + "元";
                 if (StringUtils.isEmpty(remark)) {
                     remark = information;
                 } else {
                     remark = remark + "," + information;
                 }
-                feeId = tWarehouseAgreementitems.getfFeeid();
-                money = money.add(this.getCalculate(itemNums,tWarehouseAgreementitems.getfPrice(),days));
                 break;
             }
         }