[add] 结算模板-列表

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

@@ -1,9 +1,13 @@
 package com.yiqi.admin.controller.settlement;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import com.yiqi.common.constant.UrlConstants;
 import com.yiqi.settlement.domain.SettlementFactoryRate;
+import com.yiqi.settlement.domain.dto.SettlementFactoryRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO;
 import com.yiqi.settlement.service.ISettlementFactoryRateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,92 +29,89 @@ import com.yiqi.common.utils.poi.ExcelUtil;
 import com.yiqi.common.core.page.TableDataInfo;
 
 /**
- * 门店结算费率配置Controller
+ * 工厂结算费率配置Controller
  *
  * @author ruoyi
  * @date 2024-09-03
  */
-@Api(tags = "管理后台 - 门店结算费率配置")
+@Api(tags = "管理后台 - 工厂结算费率配置")
 @RestController
 @RequestMapping(UrlConstants.managerApi + "/settlement/factory/rate")
 public class SettlementFactoryRateController extends BaseController {
+
     @Autowired
     private ISettlementFactoryRateService settlementFactoryRateService;
 
-
-    //<editor-folder desc="基础函数">
-/**
- * 查询门店结算费率配置列表
- */
-@PreAuthorize("@ss.hasPermi('system:rate:list')")
-@GetMapping("/list")
-    @ApiOperation(value = "查询门店结算费率配置列表")
-    public TableDataInfo list(SettlementFactoryRate settlementFactoryRate) {
+    /**
+     * 查询工厂结算费率配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('settlement:factory:rate:list')")
+    @GetMapping("/list")
+    @ApiOperation(value = "查询工厂结算费率配置列表")
+    public TableDataInfo list(SettlementFactoryRateQueryDTO queryDTO) {
         startPage();
-        List<SettlementFactoryRate> list = settlementFactoryRateService.selectSettlementFactoryRateList(settlementFactoryRate);
+        List<SettlementFactoryRateListVO> list = settlementFactoryRateService.queryList(queryDTO);
         return getDataTable(list);
     }
 
     /**
-     * 导出门店结算费率配置列表
+     * 导出工厂结算费率配置列表
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:export')")
-    @Log(title = "门店结算费率配置", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('settlement:factory:rate:export')")
+    @Log(title = "工厂结算费率配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    @ApiOperation(value = "导出门店结算费率配置列表")
-    public void export(HttpServletResponse response, SettlementFactoryRate settlementFactoryRate) {
-        List<SettlementFactoryRate> list = settlementFactoryRateService.selectSettlementFactoryRateList(settlementFactoryRate);
-        ExcelUtil<SettlementFactoryRate> util = new ExcelUtil<SettlementFactoryRate>(SettlementFactoryRate. class);
-        util.exportExcel(response, list, "门店结算费率配置数据");
+    @ApiOperation(value = "导出工厂结算费率配置列表")
+    public void export(HttpServletResponse response, SettlementFactoryRateQueryDTO queryDTO) {
+        List<SettlementFactoryRateListVO> list = settlementFactoryRateService.queryList(queryDTO);
+        ExcelUtil<SettlementFactoryRateListVO> util = new ExcelUtil<SettlementFactoryRateListVO>(SettlementFactoryRateListVO.class);
+        util.exportExcel(response, list, "工厂结算费率配置数据");
     }
 
     /**
-     * 获取门店结算费率配置详细信息
+     * 获取工厂结算费率配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:query')")
+    @PreAuthorize("@ss.hasPermi('settlement:factory:rate:query')")
     @GetMapping(value = "/{id}")
-    @ApiOperation(value = "获取门店结算费率配置详细信息")
+    @ApiOperation(value = "获取工厂结算费率配置详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(settlementFactoryRateService.selectSettlementFactoryRateById(id));
+        return success(settlementFactoryRateService.getById(id));
     }
 
     /**
-     * 新增门店结算费率配置
+     * 新增工厂结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:add')")
-    @Log(title = "门店结算费率配置", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('settlement:factory:rate:add')")
+    @Log(title = "工厂结算费率配置", businessType = BusinessType.INSERT)
     @PostMapping
-    @ApiOperation(value = "新增门店结算费率配置")
+    @ApiOperation(value = "新增工厂结算费率配置")
     public AjaxResult add(@RequestBody SettlementFactoryRate settlementFactoryRate) {
         settlementFactoryRate.setCreateById(getUserId());
         settlementFactoryRate.setCreateBy(getUsername());
-        return toAjax(settlementFactoryRateService.insertSettlementFactoryRate(settlementFactoryRate));
+        return toAjax(settlementFactoryRateService.save(settlementFactoryRate));
     }
 
     /**
-     * 修改门店结算费率配置
+     * 修改工厂结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:edit')")
-    @Log(title = "门店结算费率配置", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('settlement:factory:rate:edit')")
+    @Log(title = "工厂结算费率配置", businessType = BusinessType.UPDATE)
     @PutMapping
-    @ApiOperation(value = "修改门店结算费率配置")
+    @ApiOperation(value = "修改工厂结算费率配置")
     public AjaxResult edit(@RequestBody SettlementFactoryRate settlementFactoryRate) {
         settlementFactoryRate.setUpdateById(getUserId());
         settlementFactoryRate.setUpdateBy(getUsername());
-        return toAjax(settlementFactoryRateService.updateSettlementFactoryRate(settlementFactoryRate));
+        return toAjax(settlementFactoryRateService.updateById(settlementFactoryRate));
     }
 
     /**
-     * 删除门店结算费率配置
+     * 删除工厂结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:remove')")
-    @Log(title = "门店结算费率配置", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('settlement:factory:rate:remove')")
+    @Log(title = "工厂结算费率配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    @ApiOperation(value = "删除门店结算费率配置")
+    @ApiOperation(value = "删除工厂结算费率配置")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(settlementFactoryRateService.deleteSettlementFactoryRateByIds(ids));
+        return toAjax(settlementFactoryRateService.removeByIds(Arrays.asList(ids)));
     }
 
-
-    //</editor-folder>
 }

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

@@ -1,9 +1,13 @@
 package com.yiqi.admin.controller.settlement;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import com.yiqi.common.constant.UrlConstants;
 import com.yiqi.settlement.domain.SettlementStoreRate;
+import com.yiqi.settlement.domain.dto.SettlementStoreRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementStoreRateListVO;
 import com.yiqi.settlement.service.ISettlementStoreRateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,83 +38,80 @@ import com.yiqi.common.core.page.TableDataInfo;
 @RestController
 @RequestMapping(UrlConstants.managerApi + "/settlement/store/rate")
 public class SettlementStoreRateController extends BaseController {
+
     @Autowired
     private ISettlementStoreRateService settlementStoreRateService;
 
-
-    //<editor-folder desc="基础函数">
-/**
- * 查询门店结算费率配置列表
- */
-@PreAuthorize("@ss.hasPermi('system:rate:list')")
-@GetMapping("/list")
+    /**
+     * 查询门店结算费率配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('settlement:store:rate:list')")
+    @GetMapping("/list")
     @ApiOperation(value = "查询门店结算费率配置列表")
-    public TableDataInfo list(SettlementStoreRate settlementStoreRate) {
+    public TableDataInfo list(SettlementStoreRateQueryDTO queryDTO) {
         startPage();
-        List<SettlementStoreRate> list = settlementStoreRateService.selectSettlementStoreRateList(settlementStoreRate);
+        List<SettlementStoreRateListVO> list = settlementStoreRateService.queryList(queryDTO);
         return getDataTable(list);
     }
 
     /**
      * 导出门店结算费率配置列表
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:export')")
+    @PreAuthorize("@ss.hasPermi('settlement:store:rate:export')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出门店结算费率配置列表")
-    public void export(HttpServletResponse response, SettlementStoreRate settlementStoreRate) {
-        List<SettlementStoreRate> list = settlementStoreRateService.selectSettlementStoreRateList(settlementStoreRate);
-        ExcelUtil<SettlementStoreRate> util = new ExcelUtil<SettlementStoreRate>(SettlementStoreRate. class);
+    public void export(HttpServletResponse response, SettlementStoreRateQueryDTO queryDTO) {
+        List<SettlementStoreRateListVO> list = settlementStoreRateService.queryList(queryDTO);
+        ExcelUtil<SettlementStoreRateListVO> util = new ExcelUtil<SettlementStoreRateListVO>(SettlementStoreRateListVO.class);
         util.exportExcel(response, list, "门店结算费率配置数据");
     }
 
     /**
      * 获取门店结算费率配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:query')")
+    @PreAuthorize("@ss.hasPermi('settlement:rate:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取门店结算费率配置详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(settlementStoreRateService.selectSettlementStoreRateById(id));
+        return success(settlementStoreRateService.getById(id));
     }
 
     /**
      * 新增门店结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:add')")
+    @PreAuthorize("@ss.hasPermi('settlement:rate:add')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增门店结算费率配置")
     public AjaxResult add(@RequestBody SettlementStoreRate settlementStoreRate) {
         settlementStoreRate.setCreateById(getUserId());
         settlementStoreRate.setCreateBy(getUsername());
-        return toAjax(settlementStoreRateService.insertSettlementStoreRate(settlementStoreRate));
+        return toAjax(settlementStoreRateService.save(settlementStoreRate));
     }
 
     /**
      * 修改门店结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:edit')")
+    @PreAuthorize("@ss.hasPermi('settlement:rate:edit')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改门店结算费率配置")
     public AjaxResult edit(@RequestBody SettlementStoreRate settlementStoreRate) {
         settlementStoreRate.setUpdateById(getUserId());
         settlementStoreRate.setUpdateBy(getUsername());
-        return toAjax(settlementStoreRateService.updateSettlementStoreRate(settlementStoreRate));
+        return toAjax(settlementStoreRateService.updateById(settlementStoreRate));
     }
 
     /**
      * 删除门店结算费率配置
      */
-    @PreAuthorize("@ss.hasPermi('system:rate:remove')")
+    @PreAuthorize("@ss.hasPermi('settlement:rate:remove')")
     @Log(title = "门店结算费率配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除门店结算费率配置")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(settlementStoreRateService.deleteSettlementStoreRateByIds(ids));
+        return toAjax(settlementStoreRateService.removeByIds(Arrays.asList(ids)));
     }
 
-
-    //</editor-folder>
 }

yiqi-common/src/main/java/com/yiqi/settlement/domain/dto/SettlementFactoryRateQueryDTO.java

@@ -0,0 +1,20 @@
+package com.yiqi.settlement.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author BKGin
+ * @Email libra14xu@gmail.com
+ * @Date 2024-09-03
+ */
+@Data
+public class SettlementFactoryRateQueryDTO implements Serializable {
+
+    /**
+     * 工厂id
+     */
+    private Long factoryId;
+
+}

yiqi-common/src/main/java/com/yiqi/settlement/domain/dto/SettlementStoreRateQueryDTO.java

@@ -0,0 +1,20 @@
+package com.yiqi.settlement.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author BKGin
+ * @Email libra14xu@gmail.com
+ * @Date 2024-09-03
+ */
+@Data
+public class SettlementStoreRateQueryDTO implements Serializable {
+
+    /**
+     * 门店id
+     */
+    private Long storeId;
+
+}

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

@@ -0,0 +1,64 @@
+package com.yiqi.settlement.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yiqi.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author BKGin
+ * @Email libra14xu@gmail.com
+ * @Date 2024-09-03
+ */
+@Data
+public class SettlementFactoryRateListVO implements Serializable {
+
+    /**
+     * 工厂名称
+     */
+    @Excel(name = "工厂名称")
+    @ApiModelProperty("工厂名称")
+    private String factoryName;
+
+    /**
+     * 材料费率
+     */
+    @Excel(name = "材料费率")
+    @ApiModelProperty("材料费率")
+    private BigDecimal materialRate;
+
+    /**
+     * 系统管理费率
+     */
+    @Excel(name = "系统管理费率")
+    @ApiModelProperty("系统管理费率")
+    private BigDecimal managementRate;
+
+    /**
+     * 押金费率
+     */
+    @Excel(name = "押金费率")
+    @ApiModelProperty("押金费率")
+    private BigDecimal depositRate;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("开始时间")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("结束时间")
+    private Date endDate;
+
+}

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

@@ -0,0 +1,114 @@
+package com.yiqi.settlement.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yiqi.common.annotation.Excel;
+import com.yiqi.settlement.domain.SettlementStoreRate;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author BKGin
+ * @Email libra14xu@gmail.com
+ * @Date 2024-09-03
+ */
+@Data
+public class SettlementStoreRateListVO implements Serializable {
+
+    /**
+     * 门店名称
+     */
+    @Excel(name = "门店名称")
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    /**
+     * 工厂结算费率
+     */
+    @Excel(name = "工厂结算费率")
+    @ApiModelProperty("工厂结算费率")
+    private BigDecimal factoryRate;
+
+    /**
+     * 材料费率
+     */
+    @Excel(name = "材料费率")
+    @ApiModelProperty("材料费率")
+    private BigDecimal materialRate;
+
+    /**
+     * 会员卡押金费率
+     */
+    @Excel(name = "会员卡押金费率")
+    @ApiModelProperty("会员卡押金费率")
+    private BigDecimal cardDepositRate;
+
+    /**
+     * 福利押金费率
+     */
+    @Excel(name = "福利押金费率")
+    @ApiModelProperty("福利押金费率")
+    private BigDecimal welfareDepositRate;
+
+    /**
+     * 卡密押金费率
+     */
+    @Excel(name = "卡密押金费率")
+    @ApiModelProperty("卡密押金费率")
+    private BigDecimal passwordDepositRate;
+
+    /**
+     * 异店消费费率
+     */
+    @Excel(name = "异店消费费率")
+    @ApiModelProperty("异店消费费率")
+    private BigDecimal otherConsumeRate;
+
+    /**
+     * 支付宝支付费率
+     */
+    @Excel(name = "支付宝支付费率")
+    @ApiModelProperty("支付宝支付费率")
+    private BigDecimal aliPayRate;
+
+    /**
+     * 微信支付费率
+     */
+    @Excel(name = "微信支付费率")
+    @ApiModelProperty("微信支付费率")
+    private BigDecimal wxPayRate;
+
+    /**
+     * 系统管理费率
+     */
+    @Excel(name = "系统管理费率")
+    @ApiModelProperty("系统管理费率")
+    private BigDecimal managementRate;
+
+    /**
+     * 洗衣费率
+     */
+    @Excel(name = "洗衣费率")
+    @ApiModelProperty("洗衣费率")
+    private BigDecimal washRate;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("开始时间")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("结束时间")
+    private Date endDate;
+
+}

yiqi-common/src/main/java/com/yiqi/settlement/service/ISettlementFactoryRateService.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yiqi.settlement.domain.SettlementFactoryRate;
+import com.yiqi.settlement.domain.dto.SettlementFactoryRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO;
 
 /**
  * 门店结算费率配置Service接口
@@ -13,56 +15,10 @@ import com.yiqi.settlement.domain.SettlementFactoryRate;
  */
 public interface ISettlementFactoryRateService extends IService<SettlementFactoryRate> {
 
-    //<editor-folder desc="基础函数">
-
-    /**
-     * 查询门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 门店结算费率配置
-     */
-    public SettlementFactoryRate selectSettlementFactoryRateById(Long id);
-
-    /**
-     * 查询门店结算费率配置列表
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 门店结算费率配置集合
-     */
-    public List<SettlementFactoryRate> selectSettlementFactoryRateList(SettlementFactoryRate settlementFactoryRate);
-
-    /**
-     * 新增门店结算费率配置
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 结果
-     */
-    public int insertSettlementFactoryRate(SettlementFactoryRate settlementFactoryRate);
-
     /**
-     * 修改门店结算费率配置
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 结果
+     * 查询工厂结算费率配置列表
+     * @param queryDTO
+     * @return
      */
-    public int updateSettlementFactoryRate(SettlementFactoryRate settlementFactoryRate);
-
-    /**
-     * 批量删除门店结算费率配置
-     *
-     * @param ids 需要删除的门店结算费率配置主键集合
-     * @return 结果
-     */
-    public int deleteSettlementFactoryRateByIds(Long[] ids);
-
-    /**
-     * 删除门店结算费率配置信息
-     *
-     * @param id 门店结算费率配置主键
-     * @return 结果
-     */
-    public int deleteSettlementFactoryRateById(Long id);
-
-
-    //</editor-folder>
+    List<SettlementFactoryRateListVO> queryList(SettlementFactoryRateQueryDTO queryDTO);
 }

yiqi-common/src/main/java/com/yiqi/settlement/service/ISettlementStoreRateService.java

@@ -3,6 +3,8 @@ package com.yiqi.settlement.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yiqi.settlement.domain.SettlementStoreRate;
+import com.yiqi.settlement.domain.dto.SettlementStoreRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementStoreRateListVO;
 
 /**
  * 门店结算费率配置Service接口
@@ -12,55 +14,12 @@ import com.yiqi.settlement.domain.SettlementStoreRate;
  */
 public interface ISettlementStoreRateService extends IService<SettlementStoreRate> {
 
-    //<editor-folder desc="基础函数">
-    /**
-     * 查询门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 门店结算费率配置
-     */
-    public SettlementStoreRate selectSettlementStoreRateById(Long id);
-
     /**
      * 查询门店结算费率配置列表
      *
-     * @param settlementStoreRate 门店结算费率配置
+     * @param queryDTO 门店结算费率配置
      * @return 门店结算费率配置集合
      */
-    public List<SettlementStoreRate> selectSettlementStoreRateList(SettlementStoreRate settlementStoreRate);
-
-    /**
-     * 新增门店结算费率配置
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 结果
-     */
-    public int insertSettlementStoreRate(SettlementStoreRate settlementStoreRate);
-
-    /**
-     * 修改门店结算费率配置
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 结果
-     */
-    public int updateSettlementStoreRate(SettlementStoreRate settlementStoreRate);
-
-    /**
-     * 批量删除门店结算费率配置
-     *
-     * @param ids 需要删除的门店结算费率配置主键集合
-     * @return 结果
-     */
-    public int deleteSettlementStoreRateByIds(Long[] ids);
-
-    /**
-     * 删除门店结算费率配置信息
-     *
-     * @param id 门店结算费率配置主键
-     * @return 结果
-     */
-    public int deleteSettlementStoreRateById(Long id);
-
+    List<SettlementStoreRateListVO> queryList(SettlementStoreRateQueryDTO queryDTO);
 
-    //</editor-folder>
 }

yiqi-core/src/main/java/com/yiqi/settlement/mapper/SettlementFactoryRateMapper.java

@@ -4,7 +4,10 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiqi.settlement.domain.SettlementFactoryRate;
+import com.yiqi.settlement.domain.dto.SettlementFactoryRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 门店结算费率配置Mapper接口
@@ -14,54 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SettlementFactoryRateMapper extends BaseMapper<SettlementFactoryRate> {
-    //<editor-folder desc="基础韩素">
 
-    /**
-     * 查询门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 门店结算费率配置
-     */
-    public SettlementFactoryRate selectSettlementFactoryRateById(Long id);
-
-    /**
-     * 查询门店结算费率配置列表
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 门店结算费率配置集合
-     */
-    public List<SettlementFactoryRate> selectSettlementFactoryRateList(SettlementFactoryRate settlementFactoryRate);
-
-    /**
-     * 新增门店结算费率配置
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 结果
-     */
-    public int insertSettlementFactoryRate(SettlementFactoryRate settlementFactoryRate);
-
-    /**
-     * 修改门店结算费率配置
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 结果
-     */
-    public int updateSettlementFactoryRate(SettlementFactoryRate settlementFactoryRate);
-
-    /**
-     * 删除门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 结果
-     */
-    public int deleteSettlementFactoryRateById(Long id);
-
-    /**
-     * 批量删除门店结算费率配置
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSettlementFactoryRateByIds(Long[] ids);
-    //</editor-folder>
+    List<SettlementFactoryRateListVO> queryList(@Param("factoryId") Long factoryId);
 }

yiqi-core/src/main/java/com/yiqi/settlement/mapper/SettlementStoreRateMapper.java

@@ -3,8 +3,12 @@ package com.yiqi.settlement.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiqi.settlement.domain.SettlementStoreRate;
+import com.yiqi.settlement.domain.dto.SettlementStoreRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementStoreRateListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 门店结算费率配置Mapper接口
@@ -14,54 +18,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SettlementStoreRateMapper extends BaseMapper<SettlementStoreRate> {
-    //<editor-folder desc="基础韩素">
-
-    /**
-     * 查询门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 门店结算费率配置
-     */
-    public SettlementStoreRate selectSettlementStoreRateById(Long id);
 
     /**
      * 查询门店结算费率配置列表
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 门店结算费率配置集合
-     */
-    public List<SettlementStoreRate> selectSettlementStoreRateList(SettlementStoreRate settlementStoreRate);
-
-    /**
-     * 新增门店结算费率配置
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 结果
-     */
-    public int insertSettlementStoreRate(SettlementStoreRate settlementStoreRate);
-
-    /**
-     * 修改门店结算费率配置
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 结果
      */
-    public int updateSettlementStoreRate(SettlementStoreRate settlementStoreRate);
+    List<SettlementStoreRateListVO> queryList(@Param("storeId") Long storeId);
 
-    /**
-     * 删除门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 结果
-     */
-    public int deleteSettlementStoreRateById(Long id);
-
-    /**
-     * 批量删除门店结算费率配置
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSettlementStoreRateByIds(Long[] ids);
-    //</editor-folder>
 }

yiqi-core/src/main/java/com/yiqi/settlement/service/impl/SettlementFactoryRateServiceImpl.java

@@ -1,10 +1,13 @@
 package com.yiqi.settlement.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.yiqi.common.utils.DateUtils;
 import com.yiqi.common.utils.SecurityUtils;
 import com.yiqi.settlement.domain.SettlementFactoryRate;
+import com.yiqi.settlement.domain.dto.SettlementFactoryRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO;
 import com.yiqi.settlement.mapper.SettlementFactoryRateMapper;
 import com.yiqi.settlement.service.ISettlementFactoryRateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,77 +24,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class SettlementFactoryRateServiceImpl extends ServiceImpl<SettlementFactoryRateMapper, SettlementFactoryRate> implements ISettlementFactoryRateService {
 
-    //<editor-folder desc="基础韩素">
-
-    /**
-     * 查询门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 门店结算费率配置
-     */
-    @Override
-    public SettlementFactoryRate selectSettlementFactoryRateById(Long id) {
-        return baseMapper.selectSettlementFactoryRateById(id);
-    }
-
-    /**
-     * 查询门店结算费率配置列表
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 门店结算费率配置
-     */
-    @Override
-    public List<SettlementFactoryRate> selectSettlementFactoryRateList(SettlementFactoryRate settlementFactoryRate) {
-        return baseMapper.selectSettlementFactoryRateList(settlementFactoryRate);
-    }
-
-    /**
-     * 新增门店结算费率配置
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 结果
-     */
-    @Override
-    public int insertSettlementFactoryRate(SettlementFactoryRate settlementFactoryRate) {
-        settlementFactoryRate.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertSettlementFactoryRate(settlementFactoryRate);
-    }
-
-    /**
-     * 修改门店结算费率配置
-     *
-     * @param settlementFactoryRate 门店结算费率配置
-     * @return 结果
-     */
     @Override
-    public int updateSettlementFactoryRate(SettlementFactoryRate settlementFactoryRate) {
-        settlementFactoryRate.setUpdateTime(DateUtils.getNowDate());
-        return baseMapper.updateSettlementFactoryRate(settlementFactoryRate);
+    public List<SettlementFactoryRateListVO> queryList(SettlementFactoryRateQueryDTO queryDTO) {
+        List<SettlementFactoryRateListVO> voList = baseMapper.queryList(queryDTO.getFactoryId());
+        return voList;
     }
-
-    /**
-     * 批量删除门店结算费率配置
-     *
-     * @param ids 需要删除的门店结算费率配置主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSettlementFactoryRateByIds(Long[] ids) {
-        return baseMapper.deleteSettlementFactoryRateByIds(ids);
-    }
-
-    /**
-     * 删除门店结算费率配置信息
-     *
-     * @param id 门店结算费率配置主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSettlementFactoryRateById(Long id) {
-        return baseMapper.deleteSettlementFactoryRateById(id);
-    }
-
-
-    //</editor-folder>
-
 }

yiqi-core/src/main/java/com/yiqi/settlement/service/impl/SettlementStoreRateServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.List;
 import com.yiqi.common.utils.DateUtils;
 import com.yiqi.common.utils.SecurityUtils;
 import com.yiqi.settlement.domain.SettlementStoreRate;
+import com.yiqi.settlement.domain.dto.SettlementStoreRateQueryDTO;
+import com.yiqi.settlement.domain.vo.SettlementStoreRateListVO;
 import com.yiqi.settlement.mapper.SettlementStoreRateMapper;
 import com.yiqi.settlement.service.ISettlementStoreRateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,77 +23,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class SettlementStoreRateServiceImpl extends ServiceImpl<SettlementStoreRateMapper, SettlementStoreRate> implements ISettlementStoreRateService {
 
-    //<editor-folder desc="基础韩素">
-
-    /**
-     * 查询门店结算费率配置
-     *
-     * @param id 门店结算费率配置主键
-     * @return 门店结算费率配置
-     */
-    @Override
-    public SettlementStoreRate selectSettlementStoreRateById(Long id) {
-        return baseMapper.selectSettlementStoreRateById(id);
-    }
-
-    /**
-     * 查询门店结算费率配置列表
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 门店结算费率配置
-     */
-    @Override
-    public List<SettlementStoreRate> selectSettlementStoreRateList(SettlementStoreRate settlementStoreRate) {
-        return baseMapper.selectSettlementStoreRateList(settlementStoreRate);
-    }
-
-    /**
-     * 新增门店结算费率配置
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 结果
-     */
-    @Override
-    public int insertSettlementStoreRate(SettlementStoreRate settlementStoreRate) {
-        settlementStoreRate.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertSettlementStoreRate(settlementStoreRate);
-    }
-
-    /**
-     * 修改门店结算费率配置
-     *
-     * @param settlementStoreRate 门店结算费率配置
-     * @return 结果
-     */
     @Override
-    public int updateSettlementStoreRate(SettlementStoreRate settlementStoreRate) {
-        settlementStoreRate.setUpdateTime(DateUtils.getNowDate());
-        return baseMapper.updateSettlementStoreRate(settlementStoreRate);
+    public List<SettlementStoreRateListVO> queryList(SettlementStoreRateQueryDTO queryDTO) {
+        List<SettlementStoreRateListVO> voList = baseMapper.queryList(queryDTO.getStoreId());
+        return voList;
     }
 
-    /**
-     * 批量删除门店结算费率配置
-     *
-     * @param ids 需要删除的门店结算费率配置主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSettlementStoreRateByIds(Long[] ids) {
-        return baseMapper.deleteSettlementStoreRateByIds(ids);
-    }
-
-    /**
-     * 删除门店结算费率配置信息
-     *
-     * @param id 门店结算费率配置主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSettlementStoreRateById(Long id) {
-        return baseMapper.deleteSettlementStoreRateById(id);
-    }
-
-
-    //</editor-folder>
-
 }

yiqi-core/src/main/resources/mapper/settlement/SettlementFactoryRateMapper.xml

@@ -4,191 +4,15 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yiqi.settlement.mapper.SettlementFactoryRateMapper">
 
-    <resultMap type="SettlementFactoryRate" id="SettlementFactoryRateResult">
-        <result property="id" column="id"/>
-        <result property="factoryId" column="factory_id"/>
-        <result property="materialRate" column="material_rate"/>
-        <result property="managementRate" column="management_rate"/>
-        <result property="depositRate" column="deposit_rate"/>
-        <result property="startDate" column="start_date"/>
-        <result property="endDate" column="end_date"/>
-        <result property="createById" column="create_by_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateById" column="update_by_id"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
 
-    <sql id="selectSettlementFactoryRateVo">
-        select id,
-               factory_id,
-               material_rate,
-               management_rate,
-               deposit_rate,
-               start_date,
-               end_date,
-               create_by_id,
-               create_by,
-               create_time,
-               update_by_id,
-               update_by,
-               update_time,
-               remark
-        from settlement_factory_rate
-    </sql>
-
-    <select id="selectSettlementFactoryRateList" parameterType="SettlementFactoryRate"
-            resultMap="SettlementFactoryRateResult">
-        <include refid="selectSettlementFactoryRateVo"/>
-        <where>
-            <if test="factoryId != null ">
-                and factory_id = #{factoryId}
-            </if>
-            <if test="materialRate != null ">
-                and material_rate = #{materialRate}
-            </if>
-            <if test="managementRate != null ">
-                and management_rate = #{managementRate}
-            </if>
-            <if test="depositRate != null ">
-                and deposit_rate = #{depositRate}
-            </if>
-            <if test="startDate != null ">
-                and start_date = #{startDate}
-            </if>
-            <if test="endDate != null ">
-                and end_date = #{endDate}
-            </if>
-        </where>
-    </select>
-
-    <select id="selectSettlementFactoryRateById" parameterType="Long"
-            resultMap="SettlementFactoryRateResult">
-        <include refid="selectSettlementFactoryRateVo"/>
-        where id = #{id}
+    <select id="queryList" resultType="com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO">
+        select f.factory_name as 'factoryName', fr.*
+        from manage_factory f
+        left join settlement_factory_rate fr on f.id = fr.factory_id
+        where f.del_flag = '0'
+        <if test="factoryId != null">
+            and f.id = #{factoryId}
+        </if>
+        order by f.id desc
     </select>
-
-    <insert id="insertSettlementFactoryRate" parameterType="SettlementFactoryRate" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into settlement_factory_rate
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="factoryId != null">factory_id,
-            </if>
-            <if test="materialRate != null">material_rate,
-            </if>
-            <if test="managementRate != null">management_rate,
-            </if>
-            <if test="depositRate != null">deposit_rate,
-            </if>
-            <if test="startDate != null">start_date,
-            </if>
-            <if test="endDate != null">end_date,
-            </if>
-            <if test="createById != null">create_by_id,
-            </if>
-            <if test="createBy != null">create_by,
-            </if>
-            <if test="createTime != null">create_time,
-            </if>
-            <if test="updateById != null">update_by_id,
-            </if>
-            <if test="updateBy != null">update_by,
-            </if>
-            <if test="updateTime != null">update_time,
-            </if>
-            <if test="remark != null">remark,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="factoryId != null">#{factoryId},
-            </if>
-            <if test="materialRate != null">#{materialRate},
-            </if>
-            <if test="managementRate != null">#{managementRate},
-            </if>
-            <if test="depositRate != null">#{depositRate},
-            </if>
-            <if test="startDate != null">#{startDate},
-            </if>
-            <if test="endDate != null">#{endDate},
-            </if>
-            <if test="createById != null">#{createById},
-            </if>
-            <if test="createBy != null">#{createBy},
-            </if>
-            <if test="createTime != null">#{createTime},
-            </if>
-            <if test="updateById != null">#{updateById},
-            </if>
-            <if test="updateBy != null">#{updateBy},
-            </if>
-            <if test="updateTime != null">#{updateTime},
-            </if>
-            <if test="remark != null">#{remark},
-            </if>
-        </trim>
-    </insert>
-
-    <update id="updateSettlementFactoryRate" parameterType="SettlementFactoryRate">
-        update settlement_factory_rate
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="factoryId != null">factory_id =
-                #{factoryId},
-            </if>
-            <if test="materialRate != null">material_rate =
-                #{materialRate},
-            </if>
-            <if test="managementRate != null">management_rate =
-                #{managementRate},
-            </if>
-            <if test="depositRate != null">deposit_rate =
-                #{depositRate},
-            </if>
-            <if test="startDate != null">start_date =
-                #{startDate},
-            </if>
-            <if test="endDate != null">end_date =
-                #{endDate},
-            </if>
-            <if test="createById != null">create_by_id =
-                #{createById},
-            </if>
-            <if test="createBy != null">create_by =
-                #{createBy},
-            </if>
-            <if test="createTime != null">create_time =
-                #{createTime},
-            </if>
-            <if test="updateById != null">update_by_id =
-                #{updateById},
-            </if>
-            <if test="updateBy != null">update_by =
-                #{updateBy},
-            </if>
-            <if test="updateTime != null">update_time =
-                #{updateTime},
-            </if>
-            <if test="remark != null">remark =
-                #{remark},
-            </if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSettlementFactoryRateById" parameterType="Long">
-        delete
-        from settlement_factory_rate
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteSettlementFactoryRateByIds" parameterType="String">
-        delete from settlement_factory_rate where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-
 </mapper>

yiqi-core/src/main/resources/mapper/settlement/SettlementStoreRateMapper.xml

@@ -4,275 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yiqi.settlement.mapper.SettlementStoreRateMapper">
 
-    <resultMap type="SettlementStoreRate" id="SettlementStoreRateResult">
-        <result property="id" column="id"/>
-        <result property="storeId" column="store_id"/>
-        <result property="factoryRate" column="factory_rate"/>
-        <result property="materialRate" column="material_rate"/>
-        <result property="cardDepositRate" column="card_deposit_rate"/>
-        <result property="welfareDepositRate" column="welfare_deposit_rate"/>
-        <result property="passwordDepositRate" column="password_deposit_rate"/>
-        <result property="otherConsumeRate" column="other_consume_rate"/>
-        <result property="aliPayRate" column="ali_pay_rate"/>
-        <result property="wxPayRate" column="wx_pay_rate"/>
-        <result property="managementRate" column="management_rate"/>
-        <result property="washRate" column="wash_rate"/>
-        <result property="startDate" column="start_date"/>
-        <result property="endDate" column="end_date"/>
-        <result property="createById" column="create_by_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateById" column="update_by_id"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-
-    <sql id="selectSettlementStoreRateVo">
-        select id,
-               store_id,
-               factory_rate,
-               material_rate,
-               card_deposit_rate,
-               welfare_deposit_rate,
-               password_deposit_rate,
-               other_consume_rate,
-               ali_pay_rate,
-               wx_pay_rate,
-               management_rate,
-               wash_rate,
-               start_date,
-               end_date,
-               create_by_id,
-               create_by,
-               create_time,
-               update_by_id,
-               update_by,
-               update_time,
-               remark
-        from settlement_store_rate
-    </sql>
-
-    <select id="selectSettlementStoreRateList" parameterType="SettlementStoreRate"
-            resultMap="SettlementStoreRateResult">
-        <include refid="selectSettlementStoreRateVo"/>
-        <where>
-            <if test="storeId != null ">
-                and store_id = #{storeId}
-            </if>
-            <if test="factoryRate != null ">
-                and factory_rate = #{factoryRate}
-            </if>
-            <if test="materialRate != null ">
-                and material_rate = #{materialRate}
-            </if>
-            <if test="cardDepositRate != null ">
-                and card_deposit_rate = #{cardDepositRate}
-            </if>
-            <if test="welfareDepositRate != null ">
-                and welfare_deposit_rate = #{welfareDepositRate}
-            </if>
-            <if test="passwordDepositRate != null ">
-                and password_deposit_rate = #{passwordDepositRate}
-            </if>
-            <if test="otherConsumeRate != null ">
-                and other_consume_rate = #{otherConsumeRate}
-            </if>
-            <if test="aliPayRate != null ">
-                and ali_pay_rate = #{aliPayRate}
-            </if>
-            <if test="wxPayRate != null ">
-                and wx_pay_rate = #{wxPayRate}
-            </if>
-            <if test="managementRate != null ">
-                and management_rate = #{managementRate}
-            </if>
-            <if test="washRate != null ">
-                and wash_rate = #{washRate}
-            </if>
-            <if test="startDate != null ">
-                and start_date = #{startDate}
-            </if>
-            <if test="endDate != null ">
-                and end_date = #{endDate}
-            </if>
-        </where>
+    <select id="queryList" resultType="com.yiqi.settlement.domain.vo.SettlementStoreRateListVO">
+        select s.name as 'storeName', sr.*
+        from sys_store s
+        left join settlement_store_rate sr on s.id = sr.store_id
+        where s.del_flag = '0'
+        <if test="storeId != null">
+            and s.id = #{storeId}
+        </if>
+        order by s.id desc
     </select>
-
-    <select id="selectSettlementStoreRateById" parameterType="Long"
-            resultMap="SettlementStoreRateResult">
-        <include refid="selectSettlementStoreRateVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertSettlementStoreRate" parameterType="SettlementStoreRate" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into settlement_store_rate
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="storeId != null">store_id,
-            </if>
-            <if test="factoryRate != null">factory_rate,
-            </if>
-            <if test="materialRate != null">material_rate,
-            </if>
-            <if test="cardDepositRate != null">card_deposit_rate,
-            </if>
-            <if test="welfareDepositRate != null">welfare_deposit_rate,
-            </if>
-            <if test="passwordDepositRate != null">password_deposit_rate,
-            </if>
-            <if test="otherConsumeRate != null">other_consume_rate,
-            </if>
-            <if test="aliPayRate != null">ali_pay_rate,
-            </if>
-            <if test="wxPayRate != null">wx_pay_rate,
-            </if>
-            <if test="managementRate != null">management_rate,
-            </if>
-            <if test="washRate != null">wash_rate,
-            </if>
-            <if test="startDate != null">start_date,
-            </if>
-            <if test="endDate != null">end_date,
-            </if>
-            <if test="createById != null">create_by_id,
-            </if>
-            <if test="createBy != null">create_by,
-            </if>
-            <if test="createTime != null">create_time,
-            </if>
-            <if test="updateById != null">update_by_id,
-            </if>
-            <if test="updateBy != null">update_by,
-            </if>
-            <if test="updateTime != null">update_time,
-            </if>
-            <if test="remark != null">remark,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="storeId != null">#{storeId},
-            </if>
-            <if test="factoryRate != null">#{factoryRate},
-            </if>
-            <if test="materialRate != null">#{materialRate},
-            </if>
-            <if test="cardDepositRate != null">#{cardDepositRate},
-            </if>
-            <if test="welfareDepositRate != null">#{welfareDepositRate},
-            </if>
-            <if test="passwordDepositRate != null">#{passwordDepositRate},
-            </if>
-            <if test="otherConsumeRate != null">#{otherConsumeRate},
-            </if>
-            <if test="aliPayRate != null">#{aliPayRate},
-            </if>
-            <if test="wxPayRate != null">#{wxPayRate},
-            </if>
-            <if test="managementRate != null">#{managementRate},
-            </if>
-            <if test="washRate != null">#{washRate},
-            </if>
-            <if test="startDate != null">#{startDate},
-            </if>
-            <if test="endDate != null">#{endDate},
-            </if>
-            <if test="createById != null">#{createById},
-            </if>
-            <if test="createBy != null">#{createBy},
-            </if>
-            <if test="createTime != null">#{createTime},
-            </if>
-            <if test="updateById != null">#{updateById},
-            </if>
-            <if test="updateBy != null">#{updateBy},
-            </if>
-            <if test="updateTime != null">#{updateTime},
-            </if>
-            <if test="remark != null">#{remark},
-            </if>
-        </trim>
-    </insert>
-
-    <update id="updateSettlementStoreRate" parameterType="SettlementStoreRate">
-        update settlement_store_rate
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="storeId != null">store_id =
-                #{storeId},
-            </if>
-            <if test="factoryRate != null">factory_rate =
-                #{factoryRate},
-            </if>
-            <if test="materialRate != null">material_rate =
-                #{materialRate},
-            </if>
-            <if test="cardDepositRate != null">card_deposit_rate =
-                #{cardDepositRate},
-            </if>
-            <if test="welfareDepositRate != null">welfare_deposit_rate =
-                #{welfareDepositRate},
-            </if>
-            <if test="passwordDepositRate != null">password_deposit_rate =
-                #{passwordDepositRate},
-            </if>
-            <if test="otherConsumeRate != null">other_consume_rate =
-                #{otherConsumeRate},
-            </if>
-            <if test="aliPayRate != null">ali_pay_rate =
-                #{aliPayRate},
-            </if>
-            <if test="wxPayRate != null">wx_pay_rate =
-                #{wxPayRate},
-            </if>
-            <if test="managementRate != null">management_rate =
-                #{managementRate},
-            </if>
-            <if test="washRate != null">wash_rate =
-                #{washRate},
-            </if>
-            <if test="startDate != null">start_date =
-                #{startDate},
-            </if>
-            <if test="endDate != null">end_date =
-                #{endDate},
-            </if>
-            <if test="createById != null">create_by_id =
-                #{createById},
-            </if>
-            <if test="createBy != null">create_by =
-                #{createBy},
-            </if>
-            <if test="createTime != null">create_time =
-                #{createTime},
-            </if>
-            <if test="updateById != null">update_by_id =
-                #{updateById},
-            </if>
-            <if test="updateBy != null">update_by =
-                #{updateBy},
-            </if>
-            <if test="updateTime != null">update_time =
-                #{updateTime},
-            </if>
-            <if test="remark != null">remark =
-                #{remark},
-            </if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSettlementStoreRateById" parameterType="Long">
-        delete
-        from settlement_store_rate
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteSettlementStoreRateByIds" parameterType="String">
-        delete from settlement_store_rate where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-
 </mapper>