[add] 结算配置

yiqi-admin/src/main/java/com/yiqi/admin/controller/settlement/SettlementFactoryRateController.java

@@ -1,6 +1,7 @@
 package com.yiqi.admin.controller.settlement;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -87,6 +88,7 @@ public class SettlementFactoryRateController extends BaseController {
     public AjaxResult add(@RequestBody SettlementFactoryRate settlementFactoryRate) {
         settlementFactoryRate.setCreateById(getUserId());
         settlementFactoryRate.setCreateBy(getUsername());
+        settlementFactoryRate.setCreateTime(new Date());
         return toAjax(settlementFactoryRateService.save(settlementFactoryRate));
     }
 
@@ -100,6 +102,7 @@ public class SettlementFactoryRateController extends BaseController {
     public AjaxResult edit(@RequestBody SettlementFactoryRate settlementFactoryRate) {
         settlementFactoryRate.setUpdateById(getUserId());
         settlementFactoryRate.setUpdateBy(getUsername());
+        settlementFactoryRate.setUpdateTime(new Date());
         return toAjax(settlementFactoryRateService.updateById(settlementFactoryRate));
     }
 

yiqi-admin/src/main/java/com/yiqi/admin/controller/settlement/SettlementStoreRateController.java

@@ -1,6 +1,7 @@
 package com.yiqi.admin.controller.settlement;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -70,7 +71,7 @@ public class SettlementStoreRateController extends BaseController {
     /**
      * 获取门店结算费率配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('settlement:rate:query')")
+    @PreAuthorize("@ss.hasPermi('settlement:store:rate:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取门店结算费率配置详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -80,33 +81,35 @@ public class SettlementStoreRateController extends BaseController {
     /**
      * 新增门店结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('settlement:rate:add')")
+    @PreAuthorize("@ss.hasPermi('settlement:store:rate:add')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增门店结算费率配置")
     public AjaxResult add(@RequestBody SettlementStoreRate settlementStoreRate) {
         settlementStoreRate.setCreateById(getUserId());
         settlementStoreRate.setCreateBy(getUsername());
+        settlementStoreRate.setCreateTime(new Date());
         return toAjax(settlementStoreRateService.save(settlementStoreRate));
     }
 
     /**
      * 修改门店结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('settlement:rate:edit')")
+    @PreAuthorize("@ss.hasPermi('settlement:store:rate:edit')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改门店结算费率配置")
     public AjaxResult edit(@RequestBody SettlementStoreRate settlementStoreRate) {
         settlementStoreRate.setUpdateById(getUserId());
         settlementStoreRate.setUpdateBy(getUsername());
+        settlementStoreRate.setUpdateTime(new Date());
         return toAjax(settlementStoreRateService.updateById(settlementStoreRate));
     }
 
     /**
      * 删除门店结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('settlement:rate:remove')")
+    @PreAuthorize("@ss.hasPermi('settlement:store:rate:remove')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除门店结算费率配置")

yiqi-common/src/main/java/com/yiqi/settlement/domain/vo/SettlementFactoryRateListVO.java

@@ -17,6 +17,7 @@ import java.util.Date;
 @Data
 public class SettlementFactoryRateListVO implements Serializable {
 
+    private Long id;
     private Long factoryId;
 
     /**

yiqi-common/src/main/java/com/yiqi/settlement/domain/vo/SettlementStoreRateListVO.java

@@ -18,6 +18,7 @@ import java.util.Date;
 @Data
 public class SettlementStoreRateListVO implements Serializable {
 
+    private Long id;
     private Long storeId;
 
     /**