增加积分功能模块

Yijia-SaaS/yijia-integral/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>yijia</artifactId>
+        <groupId>com.yijia</groupId>
+        <version>1.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yijia-integral</artifactId>
+
+    <description>积分管理</description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-system</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-station</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-customer</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/controller/CustomerPointsController.java

@@ -0,0 +1,103 @@
+package com.yijia.integral.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.integral.domain.CustomerPoints;
+import com.yijia.integral.service.ICustomerPointsService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 用户积分Controller
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+@RestController
+@RequestMapping("/integral/points")
+public class CustomerPointsController extends BaseController
+{
+    @Autowired
+    private ICustomerPointsService customerPointsService;
+
+    /**
+     * 查询用户积分列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:points:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CustomerPoints customerPoints)
+    {
+        startPage();
+        List<CustomerPoints> list = customerPointsService.selectCustomerPointsList(customerPoints);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户积分列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:points:export')")
+    @Log(title = "用户积分", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(CustomerPoints customerPoints)
+    {
+        List<CustomerPoints> list = customerPointsService.selectCustomerPointsList(customerPoints);
+        ExcelUtil<CustomerPoints> util = new ExcelUtil<CustomerPoints>(CustomerPoints.class);
+        return util.exportExcel(list, "points");
+    }
+
+    /**
+     * 获取用户积分详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:points:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(customerPointsService.selectCustomerPointsById(id));
+    }
+
+    /**
+     * 新增用户积分
+     */
+    @PreAuthorize("@ss.hasPermi('integral:points:add')")
+    @Log(title = "用户积分", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CustomerPoints customerPoints)
+    {
+        return toAjax(customerPointsService.insertCustomerPoints(customerPoints));
+    }
+
+    /**
+     * 修改用户积分
+     */
+    @PreAuthorize("@ss.hasPermi('integral:points:edit')")
+    @Log(title = "用户积分", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CustomerPoints customerPoints)
+    {
+        return toAjax(customerPointsService.updateCustomerPoints(customerPoints));
+    }
+
+    /**
+     * 删除用户积分
+     */
+    @PreAuthorize("@ss.hasPermi('integral:points:remove')")
+    @Log(title = "用户积分", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(customerPointsService.deleteCustomerPointsByIds(ids));
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/controller/IntegralOrderController.java

@@ -0,0 +1,103 @@
+package com.yijia.integral.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.integral.domain.IntegralOrder;
+import com.yijia.integral.service.IIntegralOrderService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 积分消费订单Controller
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+@RestController
+@RequestMapping("/integral/order")
+public class IntegralOrderController extends BaseController
+{
+    @Autowired
+    private IIntegralOrderService integralOrderService;
+
+    /**
+     * 查询积分消费订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(IntegralOrder integralOrder)
+    {
+        startPage();
+        List<IntegralOrder> list = integralOrderService.selectIntegralOrderList(integralOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出积分消费订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:order:export')")
+    @Log(title = "积分消费订单", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(IntegralOrder integralOrder)
+    {
+        List<IntegralOrder> list = integralOrderService.selectIntegralOrderList(integralOrder);
+        ExcelUtil<IntegralOrder> util = new ExcelUtil<IntegralOrder>(IntegralOrder.class);
+        return util.exportExcel(list, "order");
+    }
+
+    /**
+     * 获取积分消费订单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:order:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(integralOrderService.selectIntegralOrderById(id));
+    }
+
+    /**
+     * 新增积分消费订单
+     */
+    @PreAuthorize("@ss.hasPermi('integral:order:add')")
+    @Log(title = "积分消费订单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody IntegralOrder integralOrder)
+    {
+        return toAjax(integralOrderService.insertIntegralOrder(integralOrder));
+    }
+
+    /**
+     * 修改积分消费订单
+     */
+    @PreAuthorize("@ss.hasPermi('integral:order:edit')")
+    @Log(title = "积分消费订单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody IntegralOrder integralOrder)
+    {
+        return toAjax(integralOrderService.updateIntegralOrder(integralOrder));
+    }
+
+    /**
+     * 删除积分消费订单
+     */
+    @PreAuthorize("@ss.hasPermi('integral:order:remove')")
+    @Log(title = "积分消费订单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(integralOrderService.deleteIntegralOrderByIds(ids));
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/controller/IntegralRuleController.java

@@ -0,0 +1,103 @@
+package com.yijia.integral.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.integral.domain.IntegralRule;
+import com.yijia.integral.service.IIntegralRuleService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+@RestController
+@RequestMapping("/integral/rule")
+public class IntegralRuleController extends BaseController
+{
+    @Autowired
+    private IIntegralRuleService integralRuleService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:rule:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(IntegralRule integralRule)
+    {
+        startPage();
+        List<IntegralRule> list = integralRuleService.selectIntegralRuleList(integralRule);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:rule:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(IntegralRule integralRule)
+    {
+        List<IntegralRule> list = integralRuleService.selectIntegralRuleList(integralRule);
+        ExcelUtil<IntegralRule> util = new ExcelUtil<IntegralRule>(IntegralRule.class);
+        return util.exportExcel(list, "rule");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:rule:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(integralRuleService.selectIntegralRuleById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('integral:rule:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody IntegralRule integralRule)
+    {
+        return toAjax(integralRuleService.insertIntegralRule(integralRule));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('integral:rule:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody IntegralRule integralRule)
+    {
+        return toAjax(integralRuleService.updateIntegralRule(integralRule));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('integral:rule:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(integralRuleService.deleteIntegralRuleByIds(ids));
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/controller/IntegralShopPicController.java

@@ -0,0 +1,103 @@
+package com.yijia.integral.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.integral.domain.IntegralShopPic;
+import com.yijia.integral.service.IIntegralShopPicService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 积分商城图片信息Controller
+ * 
+ * @author yijia
+ * @date 2021-03-11
+ */
+@RestController
+@RequestMapping("/integral/pic")
+public class IntegralShopPicController extends BaseController
+{
+    @Autowired
+    private IIntegralShopPicService integralShopPicService;
+
+    /**
+     * 查询积分商城图片信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:pic:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(IntegralShopPic integralShopPic)
+    {
+        startPage();
+        List<IntegralShopPic> list = integralShopPicService.selectIntegralShopPicList(integralShopPic);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出积分商城图片信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:pic:export')")
+    @Log(title = "积分商城图片信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(IntegralShopPic integralShopPic)
+    {
+        List<IntegralShopPic> list = integralShopPicService.selectIntegralShopPicList(integralShopPic);
+        ExcelUtil<IntegralShopPic> util = new ExcelUtil<IntegralShopPic>(IntegralShopPic.class);
+        return util.exportExcel(list, "pic");
+    }
+
+    /**
+     * 获取积分商城图片信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:pic:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(integralShopPicService.selectIntegralShopPicById(id));
+    }
+
+    /**
+     * 新增积分商城图片信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:pic:add')")
+    @Log(title = "积分商城图片信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody IntegralShopPic integralShopPic)
+    {
+        return toAjax(integralShopPicService.insertIntegralShopPic(integralShopPic));
+    }
+
+    /**
+     * 修改积分商城图片信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:pic:edit')")
+    @Log(title = "积分商城图片信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody IntegralShopPic integralShopPic)
+    {
+        return toAjax(integralShopPicService.updateIntegralShopPic(integralShopPic));
+    }
+
+    /**
+     * 删除积分商城图片信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:pic:remove')")
+    @Log(title = "积分商城图片信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(integralShopPicService.deleteIntegralShopPicByIds(ids));
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/controller/IntegralWaresController.java

@@ -0,0 +1,113 @@
+package com.yijia.integral.controller;
+
+import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.integral.domain.IntegralWares;
+import com.yijia.integral.service.IIntegralWaresService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author yijia
+ * @date 2021-03-01
+ */
+@RestController
+@RequestMapping("/integral/wares")
+public class IntegralWaresController extends BaseController
+{
+    @Autowired
+    private IIntegralWaresService integralWaresService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:wares:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(IntegralWares integralWares)
+    {
+        startPage();
+        List<IntegralWares> list = integralWaresService.selectIntegralWaresList(integralWares);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('integral:wares:export')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(IntegralWares integralWares)
+    {
+        List<IntegralWares> list = integralWaresService.selectIntegralWaresList(integralWares);
+        ExcelUtil<IntegralWares> util = new ExcelUtil<IntegralWares>(IntegralWares.class);
+        return util.exportExcel(list, "wares");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('integral:wares:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(integralWaresService.selectIntegralWaresById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('integral:wares:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody IntegralWares integralWares)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralWares.setCreateName(currentUser.getUsername());
+        integralWares.setCreateBy(currentUser.getUser().getUserId().toString());
+        integralWares.setWaresStatus("1");
+        return toAjax(integralWaresService.insertIntegralWares(integralWares));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('integral:wares:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody IntegralWares integralWares)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralWares.setUpdateName(currentUser.getUsername());
+        integralWares.setUpdateBy(currentUser.getUser().getUserId().toString());
+        return toAjax(integralWaresService.updateIntegralWares(integralWares));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('integral:wares:remove')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(integralWaresService.deleteIntegralWaresByIds(ids));
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/domain/CustomerPoints.java

@@ -0,0 +1,194 @@
+package com.yijia.integral.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 用户积分对象 customer_points
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public class CustomerPoints extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 微信用户unionID */
+    @Excel(name = "微信用户unionID")
+    private String unionId;
+
+    /** 公众号的openID */
+    @Excel(name = "公众号的openID")
+    private String blogOpenid;
+
+    /** 小程序的openID */
+    @Excel(name = "小程序的openID")
+    private String minaOpenid;
+
+    /** 用户手机号码 */
+    @Excel(name = "用户手机号码")
+    private String mobilePhone;
+
+    /** 用户剩余积分 */
+    @Excel(name = "用户剩余积分")
+    private Long points;
+
+    /** 用户已消费累计积分 */
+    @Excel(name = "用户已消费累计积分")
+    private Long consumptionPoints;
+
+    /** 用户累计积分 */
+    @Excel(name = "用户累计积分")
+    private Long accumulatePoints;
+
+    /** 用户已失效累计积分 */
+    @Excel(name = "用户已失效累计积分")
+    private Long invalidPoints;
+
+    /** 最新消费积分时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最新消费积分时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date recentConsumptionDate;
+
+    /** 油站ID */
+    @Excel(name = "油站ID")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUnionId(String unionId) 
+    {
+        this.unionId = unionId;
+    }
+
+    public String getUnionId() 
+    {
+        return unionId;
+    }
+    public void setBlogOpenid(String blogOpenid) 
+    {
+        this.blogOpenid = blogOpenid;
+    }
+
+    public String getBlogOpenid() 
+    {
+        return blogOpenid;
+    }
+    public void setMinaOpenid(String minaOpenid) 
+    {
+        this.minaOpenid = minaOpenid;
+    }
+
+    public String getMinaOpenid() 
+    {
+        return minaOpenid;
+    }
+    public void setMobilePhone(String mobilePhone) 
+    {
+        this.mobilePhone = mobilePhone;
+    }
+
+    public String getMobilePhone() 
+    {
+        return mobilePhone;
+    }
+    public void setPoints(Long points) 
+    {
+        this.points = points;
+    }
+
+    public Long getPoints() 
+    {
+        return points;
+    }
+    public void setConsumptionPoints(Long consumptionPoints) 
+    {
+        this.consumptionPoints = consumptionPoints;
+    }
+
+    public Long getConsumptionPoints() 
+    {
+        return consumptionPoints;
+    }
+    public void setAccumulatePoints(Long accumulatePoints) 
+    {
+        this.accumulatePoints = accumulatePoints;
+    }
+
+    public Long getAccumulatePoints() 
+    {
+        return accumulatePoints;
+    }
+    public void setInvalidPoints(Long invalidPoints) 
+    {
+        this.invalidPoints = invalidPoints;
+    }
+
+    public Long getInvalidPoints() 
+    {
+        return invalidPoints;
+    }
+    public void setRecentConsumptionDate(Date recentConsumptionDate) 
+    {
+        this.recentConsumptionDate = recentConsumptionDate;
+    }
+
+    public Date getRecentConsumptionDate() 
+    {
+        return recentConsumptionDate;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("unionId", getUnionId())
+            .append("blogOpenid", getBlogOpenid())
+            .append("minaOpenid", getMinaOpenid())
+            .append("mobilePhone", getMobilePhone())
+            .append("points", getPoints())
+            .append("consumptionPoints", getConsumptionPoints())
+            .append("accumulatePoints", getAccumulatePoints())
+            .append("invalidPoints", getInvalidPoints())
+            .append("recentConsumptionDate", getRecentConsumptionDate())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralOrder.java

@@ -0,0 +1,208 @@
+package com.yijia.integral.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 积分消费订单对象 integral_order
+ * 
+ * @author yijia
+ * @date 2021-03-02
+ */
+public class IntegralOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 积分订单id */
+    private Long id;
+
+    /** 积分订单号 */
+    @Excel(name = "积分订单号")
+    private String integralOrderNo;
+
+    /** 商品类型 */
+    @Excel(name = "商品类型")
+    private String waresType;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    private String waresName;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    private Long waresId;
+
+    /** 微信唯一标识 */
+    @Excel(name = "微信唯一标识")
+    private String unionId;
+
+    /** 会员名称 */
+    @Excel(name = "会员名称")
+    private String customerName;
+
+    /** 兑换数量 */
+    @Excel(name = "兑换数量")
+    private Long exchangeNum;
+
+    /** 兑换时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "兑换时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date exchangeTime;
+
+    /** 订单状态（1已完成，2已取消） */
+    @Excel(name = "订单状态", readConverterExp = "1=已完成，2已取消")
+    private String status;
+
+    /** 订单消耗积分 */
+    @Excel(name = "订单消耗积分")
+    private Long integral;
+
+    /** 油站ID */
+    @Excel(name = "油站ID")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIntegralOrderNo(String integralOrderNo) 
+    {
+        this.integralOrderNo = integralOrderNo;
+    }
+
+    public String getIntegralOrderNo() 
+    {
+        return integralOrderNo;
+    }
+    public void setWaresType(String waresType) 
+    {
+        this.waresType = waresType;
+    }
+
+    public String getWaresType() 
+    {
+        return waresType;
+    }
+    public void setWaresName(String waresName) 
+    {
+        this.waresName = waresName;
+    }
+
+    public String getWaresName() 
+    {
+        return waresName;
+    }
+    public void setWaresId(Long waresId) 
+    {
+        this.waresId = waresId;
+    }
+
+    public Long getWaresId() 
+    {
+        return waresId;
+    }
+    public void setUnionId(String unionId) 
+    {
+        this.unionId = unionId;
+    }
+
+    public String getUnionId() 
+    {
+        return unionId;
+    }
+    public void setCustomerName(String customerName) 
+    {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerName() 
+    {
+        return customerName;
+    }
+    public void setExchangeNum(Long exchangeNum) 
+    {
+        this.exchangeNum = exchangeNum;
+    }
+
+    public Long getExchangeNum() 
+    {
+        return exchangeNum;
+    }
+    public void setExchangeTime(Date exchangeTime) 
+    {
+        this.exchangeTime = exchangeTime;
+    }
+
+    public Date getExchangeTime() 
+    {
+        return exchangeTime;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setIntegral(Long integral) 
+    {
+        this.integral = integral;
+    }
+
+    public Long getIntegral() 
+    {
+        return integral;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("integralOrderNo", getIntegralOrderNo())
+            .append("waresType", getWaresType())
+            .append("waresName", getWaresName())
+            .append("waresId", getWaresId())
+            .append("unionId", getUnionId())
+            .append("customerName", getCustomerName())
+            .append("exchangeNum", getExchangeNum())
+            .append("exchangeTime", getExchangeTime())
+            .append("status", getStatus())
+            .append("integral", getIntegral())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralRule.java

@@ -0,0 +1,207 @@
+package com.yijia.integral.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 integral_rule
+ * 
+ * @author yijia
+ * @date 2021-03-11
+ */
+public class IntegralRule extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    /** 订单积分计算规则类型（1以订单实付累计 2以订单应付累计） */
+    @Excel(name = "订单积分计算规则类型", readConverterExp = "1=以订单实付累计,2=以订单应付累计")
+    private String ruleType;
+
+    /** 有效期设置 */
+    @Excel(name = "有效期设置")
+    private String termDateManage;
+
+    /** 清空积分时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "清空积分时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date emptyDate;
+
+    /** 到期提醒设置 */
+    @Excel(name = "到期提醒设置")
+    private String expirationReminder;
+
+    /** 提醒时间设置 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "提醒时间设置", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date remindDate;
+
+    /** 积分活动设置 */
+    @Excel(name = "积分活动设置")
+    private String integralActivity;
+
+    /** 日期选择 */
+    @Excel(name = "日期选择")
+    private String datePicker;
+
+    /** 积分比例 */
+    @Excel(name = "积分比例")
+    private String integralProportion;
+
+    /** 积分抵扣油品规则 */
+    @Excel(name = "积分抵扣油品规则")
+    private String integralDeductionOil;
+
+    private List<IntegralRuleDetail> itemsDetail;
+
+    public List<IntegralRuleDetail> getItemsDetail() {
+        return itemsDetail;
+    }
+
+    public void setItemsDetail(List<IntegralRuleDetail> itemsDetail) {
+        this.itemsDetail = itemsDetail;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setRuleType(String ruleType) 
+    {
+        this.ruleType = ruleType;
+    }
+
+    public String getRuleType() 
+    {
+        return ruleType;
+    }
+    public void setTermDateManage(String termDateManage) 
+    {
+        this.termDateManage = termDateManage;
+    }
+
+    public String getTermDateManage() 
+    {
+        return termDateManage;
+    }
+    public void setEmptyDate(Date emptyDate) 
+    {
+        this.emptyDate = emptyDate;
+    }
+
+    public Date getEmptyDate() 
+    {
+        return emptyDate;
+    }
+    public void setExpirationReminder(String expirationReminder) 
+    {
+        this.expirationReminder = expirationReminder;
+    }
+
+    public String getExpirationReminder() 
+    {
+        return expirationReminder;
+    }
+    public void setRemindDate(Date remindDate) 
+    {
+        this.remindDate = remindDate;
+    }
+
+    public Date getRemindDate() 
+    {
+        return remindDate;
+    }
+    public void setIntegralActivity(String integralActivity) 
+    {
+        this.integralActivity = integralActivity;
+    }
+
+    public String getIntegralActivity() 
+    {
+        return integralActivity;
+    }
+    public void setDatePicker(String datePicker) 
+    {
+        this.datePicker = datePicker;
+    }
+
+    public String getDatePicker() 
+    {
+        return datePicker;
+    }
+    public void setIntegralProportion(String integralProportion) 
+    {
+        this.integralProportion = integralProportion;
+    }
+
+    public String getIntegralProportion() 
+    {
+        return integralProportion;
+    }
+    public void setIntegralDeductionOil(String integralDeductionOil) 
+    {
+        this.integralDeductionOil = integralDeductionOil;
+    }
+
+    public String getIntegralDeductionOil() 
+    {
+        return integralDeductionOil;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("ruleType", getRuleType())
+            .append("termDateManage", getTermDateManage())
+            .append("emptyDate", getEmptyDate())
+            .append("expirationReminder", getExpirationReminder())
+            .append("remindDate", getRemindDate())
+            .append("integralActivity", getIntegralActivity())
+            .append("datePicker", getDatePicker())
+            .append("integralProportion", getIntegralProportion())
+            .append("integralDeductionOil", getIntegralDeductionOil())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralRuleDetail.java

@@ -0,0 +1,150 @@
+package com.yijia.integral.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 integral_rule_detail
+ * 
+ * @author yijia
+ * @date 2021-03-09
+ */
+public class IntegralRuleDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 规则主表主键id */
+    @Excel(name = "规则主表主键id")
+    private Long parentId;
+
+    /** 规则满足条件（满足多少升，多少元） */
+    @Excel(name = "规则满足条件", readConverterExp = "满=足多少升，多少元")
+    private BigDecimal ruleTerms;
+
+    /** 等级主键id */
+    @Excel(name = "等级主键id")
+    private Long greadId;
+
+    /** 会员等级 */
+    @Excel(name = "会员等级")
+    private String gread;
+
+    /** 油品名称 */
+    @Excel(name = "油品名称")
+    private String oilName;
+
+    /** 每消费金额 */
+    @Excel(name = "每消费金额")
+    private BigDecimal saleAmt;
+
+    /** 兑换积分 */
+    @Excel(name = "兑换积分")
+    private BigDecimal integral;
+
+    /** 规则类型 */
+    @Excel(name = "规则类型")
+    private String ruleType;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+    public void setRuleTerms(BigDecimal ruleTerms) 
+    {
+        this.ruleTerms = ruleTerms;
+    }
+
+    public BigDecimal getRuleTerms() 
+    {
+        return ruleTerms;
+    }
+    public void setGreadId(Long greadId) 
+    {
+        this.greadId = greadId;
+    }
+
+    public Long getGreadId() 
+    {
+        return greadId;
+    }
+    public void setGread(String gread) 
+    {
+        this.gread = gread;
+    }
+
+    public String getGread() 
+    {
+        return gread;
+    }
+    public void setOilName(String oilName) 
+    {
+        this.oilName = oilName;
+    }
+
+    public String getOilName() 
+    {
+        return oilName;
+    }
+    public void setSaleAmt(BigDecimal saleAmt) 
+    {
+        this.saleAmt = saleAmt;
+    }
+
+    public BigDecimal getSaleAmt() 
+    {
+        return saleAmt;
+    }
+    public void setIntegral(BigDecimal integral) 
+    {
+        this.integral = integral;
+    }
+
+    public BigDecimal getIntegral() 
+    {
+        return integral;
+    }
+    public void setRuleType(String ruleType) 
+    {
+        this.ruleType = ruleType;
+    }
+
+    public String getRuleType() 
+    {
+        return ruleType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("parentId", getParentId())
+            .append("ruleTerms", getRuleTerms())
+            .append("greadId", getGreadId())
+            .append("gread", getGread())
+            .append("oilName", getOilName())
+            .append("saleAmt", getSaleAmt())
+            .append("integral", getIntegral())
+            .append("ruleType", getRuleType())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralShopPic.java

@@ -0,0 +1,121 @@
+package com.yijia.integral.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 积分商城图片信息对象 integral_shop_pic
+ * 
+ * @author yijia
+ * @date 2021-03-11
+ */
+public class IntegralShopPic extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 图片名称 */
+    @Excel(name = "图片名称")
+    private String imgName;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String imgUrl;
+
+    /** 图片状态：0，禁用；1，启用 */
+    @Excel(name = "图片状态：0，禁用；1，启用")
+    private String imgStatus;
+
+    /** 油站ID */
+    @Excel(name = "油站ID")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    /** 规则表主键id */
+    @Excel(name = "规则表主键id")
+    private Long parentId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setImgName(String imgName) 
+    {
+        this.imgName = imgName;
+    }
+
+    public String getImgName() 
+    {
+        return imgName;
+    }
+    public void setImgUrl(String imgUrl) 
+    {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getImgUrl() 
+    {
+        return imgUrl;
+    }
+    public void setImgStatus(String imgStatus) 
+    {
+        this.imgStatus = imgStatus;
+    }
+
+    public String getImgStatus() 
+    {
+        return imgStatus;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("imgName", getImgName())
+            .append("imgUrl", getImgUrl())
+            .append("imgStatus", getImgStatus())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("parentId", getParentId())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/domain/IntegralWares.java

@@ -0,0 +1,210 @@
+package com.yijia.integral.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 integral_wares
+ * 
+ * @author yijia
+ * @date 2021-03-01
+ */
+public class IntegralWares extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商品主键id */
+    private Long id;
+
+    /** 商品类别 */
+    @Excel(name = "商品类别")
+    private String waresType;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    private String waresName;
+
+    /** 消费积分 */
+    @Excel(name = "消费积分")
+    private BigDecimal saleIntegral;
+
+    /** 商品图片 */
+    @Excel(name = "商品图片")
+    private String waresPic;
+
+    /** 商品详情 */
+    @Excel(name = "商品详情")
+    private String waresDetail;
+
+    /** 库存 */
+    @Excel(name = "库存")
+    private Long waresCount;
+
+    /** 已售货物数量 */
+    @Excel(name = "已售货物数量")
+    private Long waresOutCount;
+
+    /** 商品状态（1上架，2下架） */
+    @Excel(name = "商品状态", readConverterExp = "1=上架，2下架")
+    private String waresStatus;
+
+    /** 创建人名称 */
+    @Excel(name = "创建人名称")
+    private String createName;
+
+    /** 更新人名称 */
+    @Excel(name = "更新人名称")
+    private String updateName;
+
+    /** 油站ID */
+    @Excel(name = "油站ID")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setWaresType(String waresType) 
+    {
+        this.waresType = waresType;
+    }
+
+    public String getWaresType() 
+    {
+        return waresType;
+    }
+    public void setWaresName(String waresName) 
+    {
+        this.waresName = waresName;
+    }
+
+    public String getWaresName() 
+    {
+        return waresName;
+    }
+    public void setSaleIntegral(BigDecimal saleIntegral) 
+    {
+        this.saleIntegral = saleIntegral;
+    }
+
+    public BigDecimal getSaleIntegral() 
+    {
+        return saleIntegral;
+    }
+    public void setWaresPic(String waresPic) 
+    {
+        this.waresPic = waresPic;
+    }
+
+    public String getWaresPic() 
+    {
+        return waresPic;
+    }
+    public void setWaresDetail(String waresDetail) 
+    {
+        this.waresDetail = waresDetail;
+    }
+
+    public String getWaresDetail() 
+    {
+        return waresDetail;
+    }
+    public void setWaresCount(Long waresCount) 
+    {
+        this.waresCount = waresCount;
+    }
+
+    public Long getWaresCount() 
+    {
+        return waresCount;
+    }
+    public void setWaresOutCount(Long waresOutCount) 
+    {
+        this.waresOutCount = waresOutCount;
+    }
+
+    public Long getWaresOutCount() 
+    {
+        return waresOutCount;
+    }
+    public void setWaresStatus(String waresStatus) 
+    {
+        this.waresStatus = waresStatus;
+    }
+
+    public String getWaresStatus() 
+    {
+        return waresStatus;
+    }
+    public void setCreateName(String createName) 
+    {
+        this.createName = createName;
+    }
+
+    public String getCreateName() 
+    {
+        return createName;
+    }
+    public void setUpdateName(String updateName) 
+    {
+        this.updateName = updateName;
+    }
+
+    public String getUpdateName() 
+    {
+        return updateName;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("waresType", getWaresType())
+            .append("waresName", getWaresName())
+            .append("saleIntegral", getSaleIntegral())
+            .append("waresPic", getWaresPic())
+            .append("waresDetail", getWaresDetail())
+            .append("waresCount", getWaresCount())
+            .append("waresOutCount", getWaresOutCount())
+            .append("waresStatus", getWaresStatus())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("createName", getCreateName())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateName", getUpdateName())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/mapper/CustomerPointsMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.mapper;
+
+import java.util.List;
+import com.yijia.integral.domain.CustomerPoints;
+
+/**
+ * 用户积分Mapper接口
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public interface CustomerPointsMapper 
+{
+    /**
+     * 查询用户积分
+     * 
+     * @param id 用户积分ID
+     * @return 用户积分
+     */
+    public CustomerPoints selectCustomerPointsById(Long id);
+
+    /**
+     * 查询用户积分列表
+     * 
+     * @param customerPoints 用户积分
+     * @return 用户积分集合
+     */
+    public List<CustomerPoints> selectCustomerPointsList(CustomerPoints customerPoints);
+
+    /**
+     * 新增用户积分
+     * 
+     * @param customerPoints 用户积分
+     * @return 结果
+     */
+    public int insertCustomerPoints(CustomerPoints customerPoints);
+
+    /**
+     * 修改用户积分
+     * 
+     * @param customerPoints 用户积分
+     * @return 结果
+     */
+    public int updateCustomerPoints(CustomerPoints customerPoints);
+
+    /**
+     * 删除用户积分
+     * 
+     * @param id 用户积分ID
+     * @return 结果
+     */
+    public int deleteCustomerPointsById(Long id);
+
+    /**
+     * 批量删除用户积分
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCustomerPointsByIds(Long[] ids);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/mapper/IntegralOrderMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.mapper;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralOrder;
+
+/**
+ * 积分消费订单Mapper接口
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public interface IntegralOrderMapper 
+{
+    /**
+     * 查询积分消费订单
+     * 
+     * @param id 积分消费订单ID
+     * @return 积分消费订单
+     */
+    public IntegralOrder selectIntegralOrderById(Long id);
+
+    /**
+     * 查询积分消费订单列表
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 积分消费订单集合
+     */
+    public List<IntegralOrder> selectIntegralOrderList(IntegralOrder integralOrder);
+
+    /**
+     * 新增积分消费订单
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 结果
+     */
+    public int insertIntegralOrder(IntegralOrder integralOrder);
+
+    /**
+     * 修改积分消费订单
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 结果
+     */
+    public int updateIntegralOrder(IntegralOrder integralOrder);
+
+    /**
+     * 删除积分消费订单
+     * 
+     * @param id 积分消费订单ID
+     * @return 结果
+     */
+    public int deleteIntegralOrderById(Long id);
+
+    /**
+     * 批量删除积分消费订单
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteIntegralOrderByIds(Long[] ids);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/mapper/IntegralRuleDetailMapper.java

@@ -0,0 +1,67 @@
+package com.yijia.integral.mapper;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralRuleDetail;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author yijia
+ * @date 2021-02-25
+ */
+public interface IntegralRuleDetailMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public IntegralRuleDetail selectIntegralRuleDetailById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<IntegralRuleDetail> selectIntegralRuleDetailList(IntegralRuleDetail integralRuleDetail);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertIntegralRuleDetail(IntegralRuleDetail integralRuleDetail);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateIntegralRuleDetail(IntegralRuleDetail integralRuleDetail);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleDetailById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleDetailByIds(Long[] ids);
+
+    /***
+     * shanchu
+     * @param ruleDetail
+     */
+    public void deleteIntegralRuleDetail(IntegralRuleDetail ruleDetail);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/mapper/IntegralRuleMapper.java

@@ -0,0 +1,62 @@
+package com.yijia.integral.mapper;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralRule;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public interface IntegralRuleMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public IntegralRule selectIntegralRuleById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralRule 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<IntegralRule> selectIntegralRuleList(IntegralRule integralRule);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralRule 【请填写功能名称】
+     * @return 结果
+     */
+    public void insertIntegralRule(IntegralRule integralRule);
+  //  public IntegralRule insertIntegralRule(IntegralRule integralRule);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralRule 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateIntegralRule(IntegralRule integralRule);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleByIds(Long[] ids);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/mapper/IntegralShopPicMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.mapper;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralShopPic;
+
+/**
+ * 积分商城图片信息Mapper接口
+ * 
+ * @author yijia
+ * @date 2021-03-11
+ */
+public interface IntegralShopPicMapper 
+{
+    /**
+     * 查询积分商城图片信息
+     * 
+     * @param id 积分商城图片信息ID
+     * @return 积分商城图片信息
+     */
+    public IntegralShopPic selectIntegralShopPicById(Long id);
+
+    /**
+     * 查询积分商城图片信息列表
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 积分商城图片信息集合
+     */
+    public List<IntegralShopPic> selectIntegralShopPicList(IntegralShopPic integralShopPic);
+
+    /**
+     * 新增积分商城图片信息
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 结果
+     */
+    public int insertIntegralShopPic(IntegralShopPic integralShopPic);
+
+    /**
+     * 修改积分商城图片信息
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 结果
+     */
+    public int updateIntegralShopPic(IntegralShopPic integralShopPic);
+
+    /**
+     * 删除积分商城图片信息
+     * 
+     * @param id 积分商城图片信息ID
+     * @return 结果
+     */
+    public int deleteIntegralShopPicById(Long id);
+
+    /**
+     * 批量删除积分商城图片信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteIntegralShopPicByIds(Long[] ids);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/mapper/IntegralWaresMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.mapper;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralWares;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author yijia
+ * @date 2021-03-01
+ */
+public interface IntegralWaresMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public IntegralWares selectIntegralWaresById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<IntegralWares> selectIntegralWaresList(IntegralWares integralWares);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertIntegralWares(IntegralWares integralWares);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateIntegralWares(IntegralWares integralWares);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralWaresById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteIntegralWaresByIds(Long[] ids);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/ICustomerPointsService.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.service;
+
+import java.util.List;
+import com.yijia.integral.domain.CustomerPoints;
+
+/**
+ * 用户积分Service接口
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public interface ICustomerPointsService 
+{
+    /**
+     * 查询用户积分
+     * 
+     * @param id 用户积分ID
+     * @return 用户积分
+     */
+    public CustomerPoints selectCustomerPointsById(Long id);
+
+    /**
+     * 查询用户积分列表
+     * 
+     * @param customerPoints 用户积分
+     * @return 用户积分集合
+     */
+    public List<CustomerPoints> selectCustomerPointsList(CustomerPoints customerPoints);
+
+    /**
+     * 新增用户积分
+     * 
+     * @param customerPoints 用户积分
+     * @return 结果
+     */
+    public int insertCustomerPoints(CustomerPoints customerPoints);
+
+    /**
+     * 修改用户积分
+     * 
+     * @param customerPoints 用户积分
+     * @return 结果
+     */
+    public int updateCustomerPoints(CustomerPoints customerPoints);
+
+    /**
+     * 批量删除用户积分
+     * 
+     * @param ids 需要删除的用户积分ID
+     * @return 结果
+     */
+    public int deleteCustomerPointsByIds(Long[] ids);
+
+    /**
+     * 删除用户积分信息
+     * 
+     * @param id 用户积分ID
+     * @return 结果
+     */
+    public int deleteCustomerPointsById(Long id);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/IIntegralOrderService.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.service;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralOrder;
+
+/**
+ * 积分消费订单Service接口
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public interface IIntegralOrderService 
+{
+    /**
+     * 查询积分消费订单
+     * 
+     * @param id 积分消费订单ID
+     * @return 积分消费订单
+     */
+    public IntegralOrder selectIntegralOrderById(Long id);
+
+    /**
+     * 查询积分消费订单列表
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 积分消费订单集合
+     */
+    public List<IntegralOrder> selectIntegralOrderList(IntegralOrder integralOrder);
+
+    /**
+     * 新增积分消费订单
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 结果
+     */
+    public int insertIntegralOrder(IntegralOrder integralOrder);
+
+    /**
+     * 修改积分消费订单
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 结果
+     */
+    public int updateIntegralOrder(IntegralOrder integralOrder);
+
+    /**
+     * 批量删除积分消费订单
+     * 
+     * @param ids 需要删除的积分消费订单ID
+     * @return 结果
+     */
+    public int deleteIntegralOrderByIds(Long[] ids);
+
+    /**
+     * 删除积分消费订单信息
+     * 
+     * @param id 积分消费订单ID
+     * @return 结果
+     */
+    public int deleteIntegralOrderById(Long id);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/IIntegralRuleDetailService.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.service;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralRuleDetail;
+
+/**
+ * 【请填写功能名称】Service接口
+ * 
+ * @author yijia
+ * @date 2021-02-25
+ */
+public interface IIntegralRuleDetailService 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public IntegralRuleDetail selectIntegralRuleDetailById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<IntegralRuleDetail> selectIntegralRuleDetailList(IntegralRuleDetail integralRuleDetail);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertIntegralRuleDetail(IntegralRuleDetail integralRuleDetail);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateIntegralRuleDetail(IntegralRuleDetail integralRuleDetail);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleDetailByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleDetailById(Long id);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/IIntegralRuleService.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.service;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralRule;
+
+/**
+ * 【请填写功能名称】Service接口
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+public interface IIntegralRuleService 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public IntegralRule selectIntegralRuleById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralRule 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<IntegralRule> selectIntegralRuleList(IntegralRule integralRule);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralRule 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertIntegralRule(IntegralRule integralRule);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralRule 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateIntegralRule(IntegralRule integralRule);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralRuleById(Long id);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/IIntegralShopPicService.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.service;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralShopPic;
+
+/**
+ * 积分商城图片信息Service接口
+ * 
+ * @author yijia
+ * @date 2021-03-11
+ */
+public interface IIntegralShopPicService 
+{
+    /**
+     * 查询积分商城图片信息
+     * 
+     * @param id 积分商城图片信息ID
+     * @return 积分商城图片信息
+     */
+    public IntegralShopPic selectIntegralShopPicById(Long id);
+
+    /**
+     * 查询积分商城图片信息列表
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 积分商城图片信息集合
+     */
+    public List<IntegralShopPic> selectIntegralShopPicList(IntegralShopPic integralShopPic);
+
+    /**
+     * 新增积分商城图片信息
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 结果
+     */
+    public int insertIntegralShopPic(IntegralShopPic integralShopPic);
+
+    /**
+     * 修改积分商城图片信息
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 结果
+     */
+    public int updateIntegralShopPic(IntegralShopPic integralShopPic);
+
+    /**
+     * 批量删除积分商城图片信息
+     * 
+     * @param ids 需要删除的积分商城图片信息ID
+     * @return 结果
+     */
+    public int deleteIntegralShopPicByIds(Long[] ids);
+
+    /**
+     * 删除积分商城图片信息信息
+     * 
+     * @param id 积分商城图片信息ID
+     * @return 结果
+     */
+    public int deleteIntegralShopPicById(Long id);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/IIntegralWaresService.java

@@ -0,0 +1,61 @@
+package com.yijia.integral.service;
+
+import java.util.List;
+import com.yijia.integral.domain.IntegralWares;
+
+/**
+ * 【请填写功能名称】Service接口
+ * 
+ * @author yijia
+ * @date 2021-03-01
+ */
+public interface IIntegralWaresService 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public IntegralWares selectIntegralWaresById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<IntegralWares> selectIntegralWaresList(IntegralWares integralWares);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertIntegralWares(IntegralWares integralWares);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateIntegralWares(IntegralWares integralWares);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralWaresByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteIntegralWaresById(Long id);
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/impl/CustomerPointsServiceImpl.java

@@ -0,0 +1,93 @@
+package com.yijia.integral.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.integral.mapper.CustomerPointsMapper;
+import com.yijia.integral.domain.CustomerPoints;
+import com.yijia.integral.service.ICustomerPointsService;
+
+/**
+ * 用户积分Service业务层处理
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+@Service
+public class CustomerPointsServiceImpl implements ICustomerPointsService 
+{
+    @Autowired
+    private CustomerPointsMapper customerPointsMapper;
+
+    /**
+     * 查询用户积分
+     * 
+     * @param id 用户积分ID
+     * @return 用户积分
+     */
+    @Override
+    public CustomerPoints selectCustomerPointsById(Long id)
+    {
+        return customerPointsMapper.selectCustomerPointsById(id);
+    }
+
+    /**
+     * 查询用户积分列表
+     * 
+     * @param customerPoints 用户积分
+     * @return 用户积分
+     */
+    @Override
+    public List<CustomerPoints> selectCustomerPointsList(CustomerPoints customerPoints)
+    {
+        return customerPointsMapper.selectCustomerPointsList(customerPoints);
+    }
+
+    /**
+     * 新增用户积分
+     * 
+     * @param customerPoints 用户积分
+     * @return 结果
+     */
+    @Override
+    public int insertCustomerPoints(CustomerPoints customerPoints)
+    {
+        return customerPointsMapper.insertCustomerPoints(customerPoints);
+    }
+
+    /**
+     * 修改用户积分
+     * 
+     * @param customerPoints 用户积分
+     * @return 结果
+     */
+    @Override
+    public int updateCustomerPoints(CustomerPoints customerPoints)
+    {
+        return customerPointsMapper.updateCustomerPoints(customerPoints);
+    }
+
+    /**
+     * 批量删除用户积分
+     * 
+     * @param ids 需要删除的用户积分ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCustomerPointsByIds(Long[] ids)
+    {
+        return customerPointsMapper.deleteCustomerPointsByIds(ids);
+    }
+
+    /**
+     * 删除用户积分信息
+     * 
+     * @param id 用户积分ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCustomerPointsById(Long id)
+    {
+        return customerPointsMapper.deleteCustomerPointsById(id);
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralOrderServiceImpl.java

@@ -0,0 +1,93 @@
+package com.yijia.integral.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.integral.mapper.IntegralOrderMapper;
+import com.yijia.integral.domain.IntegralOrder;
+import com.yijia.integral.service.IIntegralOrderService;
+
+/**
+ * 积分消费订单Service业务层处理
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+@Service
+public class IntegralOrderServiceImpl implements IIntegralOrderService 
+{
+    @Autowired
+    private IntegralOrderMapper integralOrderMapper;
+
+    /**
+     * 查询积分消费订单
+     * 
+     * @param id 积分消费订单ID
+     * @return 积分消费订单
+     */
+    @Override
+    public IntegralOrder selectIntegralOrderById(Long id)
+    {
+        return integralOrderMapper.selectIntegralOrderById(id);
+    }
+
+    /**
+     * 查询积分消费订单列表
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 积分消费订单
+     */
+    @Override
+    public List<IntegralOrder> selectIntegralOrderList(IntegralOrder integralOrder)
+    {
+        return integralOrderMapper.selectIntegralOrderList(integralOrder);
+    }
+
+    /**
+     * 新增积分消费订单
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 结果
+     */
+    @Override
+    public int insertIntegralOrder(IntegralOrder integralOrder)
+    {
+        return integralOrderMapper.insertIntegralOrder(integralOrder);
+    }
+
+    /**
+     * 修改积分消费订单
+     * 
+     * @param integralOrder 积分消费订单
+     * @return 结果
+     */
+    @Override
+    public int updateIntegralOrder(IntegralOrder integralOrder)
+    {
+        return integralOrderMapper.updateIntegralOrder(integralOrder);
+    }
+
+    /**
+     * 批量删除积分消费订单
+     * 
+     * @param ids 需要删除的积分消费订单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralOrderByIds(Long[] ids)
+    {
+        return integralOrderMapper.deleteIntegralOrderByIds(ids);
+    }
+
+    /**
+     * 删除积分消费订单信息
+     * 
+     * @param id 积分消费订单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralOrderById(Long id)
+    {
+        return integralOrderMapper.deleteIntegralOrderById(id);
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralRuleDetailServiceImpl.java

@@ -0,0 +1,93 @@
+package com.yijia.integral.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.integral.mapper.IntegralRuleDetailMapper;
+import com.yijia.integral.domain.IntegralRuleDetail;
+import com.yijia.integral.service.IIntegralRuleDetailService;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ * 
+ * @author yijia
+ * @date 2021-02-25
+ */
+@Service
+public class IntegralRuleDetailServiceImpl implements IIntegralRuleDetailService 
+{
+    @Autowired
+    private IntegralRuleDetailMapper integralRuleDetailMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public IntegralRuleDetail selectIntegralRuleDetailById(Long id)
+    {
+        return integralRuleDetailMapper.selectIntegralRuleDetailById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<IntegralRuleDetail> selectIntegralRuleDetailList(IntegralRuleDetail integralRuleDetail)
+    {
+        return integralRuleDetailMapper.selectIntegralRuleDetailList(integralRuleDetail);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertIntegralRuleDetail(IntegralRuleDetail integralRuleDetail)
+    {
+        return integralRuleDetailMapper.insertIntegralRuleDetail(integralRuleDetail);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralRuleDetail 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateIntegralRuleDetail(IntegralRuleDetail integralRuleDetail)
+    {
+        return integralRuleDetailMapper.updateIntegralRuleDetail(integralRuleDetail);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralRuleDetailByIds(Long[] ids)
+    {
+        return integralRuleDetailMapper.deleteIntegralRuleDetailByIds(ids);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralRuleDetailById(Long id)
+    {
+        return integralRuleDetailMapper.deleteIntegralRuleDetailById(id);
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralRuleServiceImpl.java

@@ -0,0 +1,124 @@
+package com.yijia.integral.service.impl;
+
+import java.util.List;
+
+import com.yijia.integral.domain.IntegralRuleDetail;
+import com.yijia.integral.mapper.IntegralRuleDetailMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.integral.mapper.IntegralRuleMapper;
+import com.yijia.integral.domain.IntegralRule;
+import com.yijia.integral.service.IIntegralRuleService;
+
+/**
+ * 积分规则Service业务层处理
+ * 
+ * @author yijia
+ * @date 2021-02-24
+ */
+@Service
+public class IntegralRuleServiceImpl implements IIntegralRuleService 
+{
+    @Autowired
+    private IntegralRuleMapper integralRuleMapper;
+    @Autowired
+    private IntegralRuleDetailMapper integralRuleDetailMapper;
+    /**
+     * 查询积分规则
+     * 
+     * @param id 积分规则ID
+     * @return 积分规则
+     */
+    @Override
+    public IntegralRule selectIntegralRuleById(Long id)
+    {
+        IntegralRule integralRule =integralRuleMapper.selectIntegralRuleById(id);
+        IntegralRuleDetail  detail  = new  IntegralRuleDetail();
+        detail.setParentId(id);
+        List<IntegralRuleDetail> list =  integralRuleDetailMapper.selectIntegralRuleDetailList(detail);
+        integralRule.setItemsDetail(list);
+        return integralRule;
+    }
+
+    /**
+     * 查询积分规则列表
+     * 
+     * @param integralRule 积分规则
+     * @return 积分规则
+     */
+    @Override
+    public List<IntegralRule> selectIntegralRuleList(IntegralRule integralRule)
+    {
+        return integralRuleMapper.selectIntegralRuleList(integralRule);
+    }
+
+    /**
+     * 新增
+     * 
+     * @param integralRule
+     * @return 结果
+     */
+    @Override
+    public int insertIntegralRule(IntegralRule integralRule)
+    {
+        int i = 0;
+        integralRuleMapper.insertIntegralRule(integralRule);
+      //  IntegralRule rule=  integralRuleMapper.insertIntegralRule(integralRule);
+        //判断规则明细
+        if(integralRule.getItemsDetail()!=null &&  integralRule.getItemsDetail().size()>0){
+            List<IntegralRuleDetail> list =integralRule.getItemsDetail();
+            for (IntegralRuleDetail detail : list){
+                detail.setParentId(integralRule.getId().longValue());
+                i = integralRuleDetailMapper.insertIntegralRuleDetail(detail);
+            }
+        }
+        return i;
+    }
+
+    /**
+     * 修改积分规则
+     * 
+     * @param integralRule 积分规则
+     * @return 结果
+     */
+    @Override
+    public int updateIntegralRule(IntegralRule integralRule)
+    {
+        //删除对应的明细表数据
+        IntegralRuleDetail ruleDetail = new IntegralRuleDetail();
+        ruleDetail.setParentId(integralRule.getId());
+        integralRuleDetailMapper.deleteIntegralRuleDetail(ruleDetail);
+        if(integralRule.getItemsDetail()!=null &&  integralRule.getItemsDetail().size()>0){
+            List<IntegralRuleDetail> list =integralRule.getItemsDetail();
+            for (IntegralRuleDetail detail : list){
+                detail.setParentId(integralRule.getId().longValue());
+                 integralRuleDetailMapper.insertIntegralRuleDetail(detail);
+            }
+        }
+        return  integralRuleMapper.updateIntegralRule(integralRule);
+    }
+
+    /**
+     * 批量删除积分规则
+     * 
+     * @param ids 需要删除的积分规则ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralRuleByIds(Long[] ids)
+    {
+        return integralRuleMapper.deleteIntegralRuleByIds(ids);
+    }
+
+    /**
+     * 删除积分规则信息
+     * 
+     * @param id 积分规则ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralRuleById(Long id)
+    {
+        return integralRuleMapper.deleteIntegralRuleById(id);
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralShopPicServiceImpl.java

@@ -0,0 +1,93 @@
+package com.yijia.integral.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.integral.mapper.IntegralShopPicMapper;
+import com.yijia.integral.domain.IntegralShopPic;
+import com.yijia.integral.service.IIntegralShopPicService;
+
+/**
+ * 积分商城图片信息Service业务层处理
+ * 
+ * @author yijia
+ * @date 2021-03-11
+ */
+@Service
+public class IntegralShopPicServiceImpl implements IIntegralShopPicService 
+{
+    @Autowired
+    private IntegralShopPicMapper integralShopPicMapper;
+
+    /**
+     * 查询积分商城图片信息
+     * 
+     * @param id 积分商城图片信息ID
+     * @return 积分商城图片信息
+     */
+    @Override
+    public IntegralShopPic selectIntegralShopPicById(Long id)
+    {
+        return integralShopPicMapper.selectIntegralShopPicById(id);
+    }
+
+    /**
+     * 查询积分商城图片信息列表
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 积分商城图片信息
+     */
+    @Override
+    public List<IntegralShopPic> selectIntegralShopPicList(IntegralShopPic integralShopPic)
+    {
+        return integralShopPicMapper.selectIntegralShopPicList(integralShopPic);
+    }
+
+    /**
+     * 新增积分商城图片信息
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 结果
+     */
+    @Override
+    public int insertIntegralShopPic(IntegralShopPic integralShopPic)
+    {
+        return integralShopPicMapper.insertIntegralShopPic(integralShopPic);
+    }
+
+    /**
+     * 修改积分商城图片信息
+     * 
+     * @param integralShopPic 积分商城图片信息
+     * @return 结果
+     */
+    @Override
+    public int updateIntegralShopPic(IntegralShopPic integralShopPic)
+    {
+        return integralShopPicMapper.updateIntegralShopPic(integralShopPic);
+    }
+
+    /**
+     * 批量删除积分商城图片信息
+     * 
+     * @param ids 需要删除的积分商城图片信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralShopPicByIds(Long[] ids)
+    {
+        return integralShopPicMapper.deleteIntegralShopPicByIds(ids);
+    }
+
+    /**
+     * 删除积分商城图片信息信息
+     * 
+     * @param id 积分商城图片信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralShopPicById(Long id)
+    {
+        return integralShopPicMapper.deleteIntegralShopPicById(id);
+    }
+}

Yijia-SaaS/yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralWaresServiceImpl.java

@@ -0,0 +1,96 @@
+package com.yijia.integral.service.impl;
+
+import java.util.List;
+import com.yijia.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.integral.mapper.IntegralWaresMapper;
+import com.yijia.integral.domain.IntegralWares;
+import com.yijia.integral.service.IIntegralWaresService;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ * 
+ * @author yijia
+ * @date 2021-03-01
+ */
+@Service
+public class IntegralWaresServiceImpl implements IIntegralWaresService 
+{
+    @Autowired
+    private IntegralWaresMapper integralWaresMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public IntegralWares selectIntegralWaresById(Long id)
+    {
+        return integralWaresMapper.selectIntegralWaresById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<IntegralWares> selectIntegralWaresList(IntegralWares integralWares)
+    {
+        return integralWaresMapper.selectIntegralWaresList(integralWares);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertIntegralWares(IntegralWares integralWares)
+    {
+        integralWares.setCreateTime(DateUtils.getNowDate());
+        return integralWaresMapper.insertIntegralWares(integralWares);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param integralWares 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateIntegralWares(IntegralWares integralWares)
+    {
+        integralWares.setUpdateTime(DateUtils.getNowDate());
+        return integralWaresMapper.updateIntegralWares(integralWares);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralWaresByIds(Long[] ids)
+    {
+        return integralWaresMapper.deleteIntegralWaresByIds(ids);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     * 
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteIntegralWaresById(Long id)
+    {
+        return integralWaresMapper.deleteIntegralWaresById(id);
+    }
+}

Yijia-SaaS/yijia-integral/src/main/resources/mapper/integral/CustomerPointsMapper.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.integral.mapper.CustomerPointsMapper">
+    
+    <resultMap type="CustomerPoints" id="CustomerPointsResult">
+        <result property="id"    column="id"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="blogOpenid"    column="blog_openid"    />
+        <result property="minaOpenid"    column="mina_openid"    />
+        <result property="mobilePhone"    column="mobile_phone"    />
+        <result property="points"    column="points"    />
+        <result property="consumptionPoints"    column="consumption_points"    />
+        <result property="accumulatePoints"    column="accumulate_points"    />
+        <result property="invalidPoints"    column="invalid_points"    />
+        <result property="recentConsumptionDate"    column="recent_consumption_date"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+    </resultMap>
+
+    <sql id="selectCustomerPointsVo">
+        select id, union_id, blog_openid, mina_openid, mobile_phone, points, consumption_points, accumulate_points, invalid_points, recent_consumption_date, station_id, station_name from customer_points
+    </sql>
+
+    <select id="selectCustomerPointsList" parameterType="CustomerPoints" resultMap="CustomerPointsResult">
+        <include refid="selectCustomerPointsVo"/>
+        <where>  
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="blogOpenid != null  and blogOpenid != ''"> and blog_openid = #{blogOpenid}</if>
+            <if test="minaOpenid != null  and minaOpenid != ''"> and mina_openid = #{minaOpenid}</if>
+            <if test="mobilePhone != null  and mobilePhone != ''"> and mobile_phone = #{mobilePhone}</if>
+            <if test="points != null "> and points = #{points}</if>
+            <if test="consumptionPoints != null "> and consumption_points = #{consumptionPoints}</if>
+            <if test="accumulatePoints != null "> and accumulate_points = #{accumulatePoints}</if>
+            <if test="invalidPoints != null "> and invalid_points = #{invalidPoints}</if>
+            <if test="recentConsumptionDate != null "> and recent_consumption_date = #{recentConsumptionDate}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectCustomerPointsById" parameterType="Long" resultMap="CustomerPointsResult">
+        <include refid="selectCustomerPointsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCustomerPoints" parameterType="CustomerPoints" useGeneratedKeys="true" keyProperty="id">
+        insert into customer_points
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="unionId != null">union_id,</if>
+            <if test="blogOpenid != null">blog_openid,</if>
+            <if test="minaOpenid != null">mina_openid,</if>
+            <if test="mobilePhone != null">mobile_phone,</if>
+            <if test="points != null">points,</if>
+            <if test="consumptionPoints != null">consumption_points,</if>
+            <if test="accumulatePoints != null">accumulate_points,</if>
+            <if test="invalidPoints != null">invalid_points,</if>
+            <if test="recentConsumptionDate != null">recent_consumption_date,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="unionId != null">#{unionId},</if>
+            <if test="blogOpenid != null">#{blogOpenid},</if>
+            <if test="minaOpenid != null">#{minaOpenid},</if>
+            <if test="mobilePhone != null">#{mobilePhone},</if>
+            <if test="points != null">#{points},</if>
+            <if test="consumptionPoints != null">#{consumptionPoints},</if>
+            <if test="accumulatePoints != null">#{accumulatePoints},</if>
+            <if test="invalidPoints != null">#{invalidPoints},</if>
+            <if test="recentConsumptionDate != null">#{recentConsumptionDate},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCustomerPoints" parameterType="CustomerPoints">
+        update customer_points
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="blogOpenid != null">blog_openid = #{blogOpenid},</if>
+            <if test="minaOpenid != null">mina_openid = #{minaOpenid},</if>
+            <if test="mobilePhone != null">mobile_phone = #{mobilePhone},</if>
+            <if test="points != null">points = #{points},</if>
+            <if test="consumptionPoints != null">consumption_points = #{consumptionPoints},</if>
+            <if test="accumulatePoints != null">accumulate_points = #{accumulatePoints},</if>
+            <if test="invalidPoints != null">invalid_points = #{invalidPoints},</if>
+            <if test="recentConsumptionDate != null">recent_consumption_date = #{recentConsumptionDate},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCustomerPointsById" parameterType="Long">
+        delete from customer_points where id = #{id}
+    </delete>
+
+    <delete id="deleteCustomerPointsByIds" parameterType="String">
+        delete from customer_points where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

Yijia-SaaS/yijia-integral/src/main/resources/mapper/integral/IntegralOrderMapper.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.integral.mapper.IntegralOrderMapper">
+    
+    <resultMap type="IntegralOrder" id="IntegralOrderResult">
+        <result property="id"    column="id"    />
+        <result property="integralOrderNo"    column="integral_order_no"    />
+        <result property="waresType"    column="wares_type"    />
+        <result property="waresName"    column="wares_name"    />
+        <result property="waresId"    column="wares_id"    />
+        <result property="unionId"    column="union_id"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="exchangeNum"    column="exchange_num"    />
+        <result property="exchangeTime"    column="exchange_time"    />
+        <result property="status"    column="status"    />
+        <result property="integral"    column="integral"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+    </resultMap>
+
+    <sql id="selectIntegralOrderVo">
+        select id, integral_order_no, wares_type, wares_name, wares_id, union_id, customer_name, exchange_num, exchange_time, status, integral, station_id, station_name from integral_order
+    </sql>
+
+    <select id="selectIntegralOrderList" parameterType="IntegralOrder" resultMap="IntegralOrderResult">
+        <include refid="selectIntegralOrderVo"/>
+        <where>  
+            <if test="integralOrderNo != null  and integralOrderNo != ''"> and integral_order_no = #{integralOrderNo}</if>
+            <if test="waresType != null  and waresType != ''"> and wares_type = #{waresType}</if>
+            <if test="waresName != null  and waresName != ''"> and wares_name like concat('%', #{waresName}, '%')</if>
+            <if test="waresId != null "> and wares_id = #{waresId}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="exchangeNum != null "> and exchange_num = #{exchangeNum}</if>
+            <if test="exchangeTime != null "> and exchange_time = #{exchangeTime}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="integral != null "> and integral = #{integral}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectIntegralOrderById" parameterType="Long" resultMap="IntegralOrderResult">
+        <include refid="selectIntegralOrderVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertIntegralOrder" parameterType="IntegralOrder" useGeneratedKeys="true" keyProperty="id">
+        insert into integral_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="integralOrderNo != null">integral_order_no,</if>
+            <if test="waresType != null">wares_type,</if>
+            <if test="waresName != null">wares_name,</if>
+            <if test="waresId != null">wares_id,</if>
+            <if test="unionId != null">union_id,</if>
+            <if test="customerName != null">customer_name,</if>
+            <if test="exchangeNum != null">exchange_num,</if>
+            <if test="exchangeTime != null">exchange_time,</if>
+            <if test="status != null">status,</if>
+            <if test="integral != null">integral,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="integralOrderNo != null">#{integralOrderNo},</if>
+            <if test="waresType != null">#{waresType},</if>
+            <if test="waresName != null">#{waresName},</if>
+            <if test="waresId != null">#{waresId},</if>
+            <if test="unionId != null">#{unionId},</if>
+            <if test="customerName != null">#{customerName},</if>
+            <if test="exchangeNum != null">#{exchangeNum},</if>
+            <if test="exchangeTime != null">#{exchangeTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="integral != null">#{integral},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIntegralOrder" parameterType="IntegralOrder">
+        update integral_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="integralOrderNo != null">integral_order_no = #{integralOrderNo},</if>
+            <if test="waresType != null">wares_type = #{waresType},</if>
+            <if test="waresName != null">wares_name = #{waresName},</if>
+            <if test="waresId != null">wares_id = #{waresId},</if>
+            <if test="unionId != null">union_id = #{unionId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="exchangeNum != null">exchange_num = #{exchangeNum},</if>
+            <if test="exchangeTime != null">exchange_time = #{exchangeTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="integral != null">integral = #{integral},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIntegralOrderById" parameterType="Long">
+        delete from integral_order where id = #{id}
+    </delete>
+
+    <delete id="deleteIntegralOrderByIds" parameterType="String">
+        delete from integral_order where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

Yijia-SaaS/yijia-integral/src/main/resources/mapper/integral/IntegralRuleDetailMapper.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.integral.mapper.IntegralRuleDetailMapper">
+    
+    <resultMap type="IntegralRuleDetail" id="IntegralRuleDetailResult">
+        <result property="id"    column="id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="ruleTerms"    column="rule_terms"    />
+        <result property="greadId"    column="gread_id"    />
+        <result property="gread"    column="gread"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="saleAmt"    column="sale_amt"    />
+        <result property="integral"    column="integral"    />
+        <result property="ruleType"    column="rule_type"    />
+    </resultMap>
+
+    <sql id="selectIntegralRuleDetailVo">
+        select id, parent_id, rule_terms, gread_id, gread, oil_name, sale_amt, integral, rule_type from integral_rule_detail
+    </sql>
+
+    <select id="selectIntegralRuleDetailList" parameterType="IntegralRuleDetail" resultMap="IntegralRuleDetailResult">
+        <include refid="selectIntegralRuleDetailVo"/>
+        <where>  
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="ruleTerms != null "> and rule_terms = #{ruleTerms}</if>
+            <if test="greadId != null "> and gread_id = #{greadId}</if>
+            <if test="gread != null  and gread != ''"> and gread = #{gread}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="saleAmt != null "> and sale_amt = #{saleAmt}</if>
+            <if test="integral != null "> and integral = #{integral}</if>
+            <if test="ruleType != null  and ruleType != ''"> and rule_type = #{ruleType}</if>
+        </where>
+    </select>
+    
+    <select id="selectIntegralRuleDetailById" parameterType="Long" resultMap="IntegralRuleDetailResult">
+        <include refid="selectIntegralRuleDetailVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertIntegralRuleDetail" parameterType="IntegralRuleDetail" useGeneratedKeys="true" keyProperty="id">
+        insert into integral_rule_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">parent_id,</if>
+            <if test="ruleTerms != null">rule_terms,</if>
+            <if test="greadId != null">gread_id,</if>
+            <if test="gread != null">gread,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="saleAmt != null">sale_amt,</if>
+            <if test="integral != null">integral,</if>
+            <if test="ruleType != null">rule_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">#{parentId},</if>
+            <if test="ruleTerms != null">#{ruleTerms},</if>
+            <if test="greadId != null">#{greadId},</if>
+            <if test="gread != null">#{gread},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="saleAmt != null">#{saleAmt},</if>
+            <if test="integral != null">#{integral},</if>
+            <if test="ruleType != null">#{ruleType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIntegralRuleDetail" parameterType="IntegralRuleDetail">
+        update integral_rule_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="ruleTerms != null">rule_terms = #{ruleTerms},</if>
+            <if test="greadId != null">gread_id = #{greadId},</if>
+            <if test="gread != null">gread = #{gread},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="saleAmt != null">sale_amt = #{saleAmt},</if>
+            <if test="integral != null">integral = #{integral},</if>
+            <if test="ruleType != null">rule_type = #{ruleType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIntegralRuleDetailById" parameterType="Long">
+        delete from integral_rule_detail where id = #{id}
+    </delete>
+
+    <delete id="deleteIntegralRuleDetailByIds" parameterType="String">
+        delete from integral_rule_detail where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteIntegralRuleDetail" parameterType="Long">
+        delete from integral_rule_detail where parent_id = #{parentId}
+    </delete>
+</mapper>

Yijia-SaaS/yijia-integral/src/main/resources/mapper/integral/IntegralRuleMapper.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.integral.mapper.IntegralRuleMapper">
+    
+    <resultMap type="IntegralRule" id="IntegralRuleResult">
+        <result property="id"    column="id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="ruleType"    column="rule_type"    />
+        <result property="termDateManage"    column="term_date_manage"    />
+        <result property="emptyDate"    column="empty_date"    />
+        <result property="expirationReminder"    column="expiration_reminder"    />
+        <result property="remindDate"    column="remind_date"    />
+        <result property="integralActivity"    column="integral_activity"    />
+        <result property="datePicker"    column="date_picker"    />
+        <result property="integralProportion"    column="integral_proportion"    />
+        <result property="integralDeductionOil"    column="integral_deduction_oil"    />
+    </resultMap>
+
+    <sql id="selectIntegralRuleVo">
+        select id, station_id, station_name, rule_type, term_date_manage, empty_date, expiration_reminder, remind_date, integral_activity, date_picker, integral_proportion, integral_deduction_oil from integral_rule
+    </sql>
+
+    <select id="selectIntegralRuleList" parameterType="IntegralRule" resultMap="IntegralRuleResult">
+        <include refid="selectIntegralRuleVo"/>
+        <where>  
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="ruleType != null  and ruleType != ''"> and rule_type = #{ruleType}</if>
+            <if test="termDateManage != null  and termDateManage != ''"> and term_date_manage = #{termDateManage}</if>
+            <if test="emptyDate != null "> and empty_date = #{emptyDate}</if>
+            <if test="expirationReminder != null  and expirationReminder != ''"> and expiration_reminder = #{expirationReminder}</if>
+            <if test="remindDate != null "> and remind_date = #{remindDate}</if>
+            <if test="integralActivity != null  and integralActivity != ''"> and integral_activity = #{integralActivity}</if>
+            <if test="datePicker != null  and datePicker != ''"> and date_picker = #{datePicker}</if>
+            <if test="integralProportion != null  and integralProportion != ''"> and integral_proportion = #{integralProportion}</if>
+            <if test="integralDeductionOil != null  and integralDeductionOil != ''"> and integral_deduction_oil = #{integralDeductionOil}</if>
+        </where>
+    </select>
+    
+    <select id="selectIntegralRuleById" parameterType="Long" resultMap="IntegralRuleResult">
+        <include refid="selectIntegralRuleVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertIntegralRule" parameterType="IntegralRule" useGeneratedKeys="true" keyProperty="id">
+        insert into integral_rule
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="ruleType != null">rule_type,</if>
+            <if test="termDateManage != null">term_date_manage,</if>
+            <if test="emptyDate != null">empty_date,</if>
+            <if test="expirationReminder != null">expiration_reminder,</if>
+            <if test="remindDate != null">remind_date,</if>
+            <if test="integralActivity != null">integral_activity,</if>
+            <if test="datePicker != null">date_picker,</if>
+            <if test="integralProportion != null">integral_proportion,</if>
+            <if test="integralDeductionOil != null">integral_deduction_oil,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="ruleType != null">#{ruleType},</if>
+            <if test="termDateManage != null">#{termDateManage},</if>
+            <if test="emptyDate != null">#{emptyDate},</if>
+            <if test="expirationReminder != null">#{expirationReminder},</if>
+            <if test="remindDate != null">#{remindDate},</if>
+            <if test="integralActivity != null">#{integralActivity},</if>
+            <if test="datePicker != null">#{datePicker},</if>
+            <if test="integralProportion != null">#{integralProportion},</if>
+            <if test="integralDeductionOil != null">#{integralDeductionOil},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIntegralRule" parameterType="IntegralRule">
+        update integral_rule
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="ruleType != null">rule_type = #{ruleType},</if>
+            <if test="termDateManage != null">term_date_manage = #{termDateManage},</if>
+            <if test="emptyDate != null">empty_date = #{emptyDate},</if>
+            <if test="expirationReminder != null">expiration_reminder = #{expirationReminder},</if>
+            <if test="remindDate != null">remind_date = #{remindDate},</if>
+            <if test="integralActivity != null">integral_activity = #{integralActivity},</if>
+            <if test="datePicker != null">date_picker = #{datePicker},</if>
+            <if test="integralProportion != null">integral_proportion = #{integralProportion},</if>
+            <if test="integralDeductionOil != null">integral_deduction_oil = #{integralDeductionOil},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIntegralRuleById" parameterType="Long">
+        delete from integral_rule where id = #{id}
+    </delete>
+
+    <delete id="deleteIntegralRuleByIds" parameterType="String">
+        delete from integral_rule where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

Yijia-SaaS/yijia-integral/src/main/resources/mapper/integral/IntegralShopPicMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.integral.mapper.IntegralShopPicMapper">
+    
+    <resultMap type="IntegralShopPic" id="IntegralShopPicResult">
+        <result property="id"    column="id"    />
+        <result property="imgName"    column="img_name"    />
+        <result property="imgUrl"    column="img_url"    />
+        <result property="imgStatus"    column="img_status"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="parentId"    column="parent_id"    />
+    </resultMap>
+
+    <sql id="selectIntegralShopPicVo">
+        select id, img_name, img_url, img_status, station_id, station_name, parent_id from integral_shop_pic
+    </sql>
+
+    <select id="selectIntegralShopPicList" parameterType="IntegralShopPic" resultMap="IntegralShopPicResult">
+        <include refid="selectIntegralShopPicVo"/>
+        <where>  
+            <if test="imgName != null  and imgName != ''"> and img_name like concat('%', #{imgName}, '%')</if>
+            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
+            <if test="imgStatus != null  and imgStatus != ''"> and img_status = #{imgStatus}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+        </where>
+    </select>
+    
+    <select id="selectIntegralShopPicById" parameterType="Long" resultMap="IntegralShopPicResult">
+        <include refid="selectIntegralShopPicVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertIntegralShopPic" parameterType="IntegralShopPic" useGeneratedKeys="true" keyProperty="id">
+        insert into integral_shop_pic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="imgName != null">img_name,</if>
+            <if test="imgUrl != null">img_url,</if>
+            <if test="imgStatus != null">img_status,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="parentId != null">parent_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="imgName != null">#{imgName},</if>
+            <if test="imgUrl != null">#{imgUrl},</if>
+            <if test="imgStatus != null">#{imgStatus},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="parentId != null">#{parentId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIntegralShopPic" parameterType="IntegralShopPic">
+        update integral_shop_pic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="imgName != null">img_name = #{imgName},</if>
+            <if test="imgUrl != null">img_url = #{imgUrl},</if>
+            <if test="imgStatus != null">img_status = #{imgStatus},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIntegralShopPicById" parameterType="Long">
+        delete from integral_shop_pic where id = #{id}
+    </delete>
+
+    <delete id="deleteIntegralShopPicByIds" parameterType="String">
+        delete from integral_shop_pic where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

Yijia-SaaS/yijia-integral/src/main/resources/mapper/integral/IntegralWaresMapper.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.integral.mapper.IntegralWaresMapper">
+    
+    <resultMap type="IntegralWares" id="IntegralWaresResult">
+        <result property="id"    column="id"    />
+        <result property="waresType"    column="wares_type"    />
+        <result property="waresName"    column="wares_name"    />
+        <result property="saleIntegral"    column="sale_integral"    />
+        <result property="waresPic"    column="wares_pic"    />
+        <result property="waresDetail"    column="wares_detail"    />
+        <result property="waresCount"    column="wares_count"    />
+        <result property="waresOutCount"    column="wares_out_count"    />
+        <result property="waresStatus"    column="wares_status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createName"    column="create_name"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateName"    column="update_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+    </resultMap>
+
+    <sql id="selectIntegralWaresVo">
+        select id, wares_type, wares_name, sale_integral, wares_pic, wares_detail, wares_count, wares_out_count, wares_status, create_time, create_by, create_name, update_time, update_by, update_name, station_id, station_name from integral_wares
+    </sql>
+
+    <select id="selectIntegralWaresList" parameterType="IntegralWares" resultMap="IntegralWaresResult">
+        <include refid="selectIntegralWaresVo"/>
+        <where>  
+            <if test="waresType != null  and waresType != ''"> and wares_type = #{waresType}</if>
+            <if test="waresName != null  and waresName != ''"> and wares_name like concat('%', #{waresName}, '%')</if>
+            <if test="saleIntegral != null "> and sale_integral = #{saleIntegral}</if>
+            <if test="waresPic != null  and waresPic != ''"> and wares_pic = #{waresPic}</if>
+            <if test="waresDetail != null  and waresDetail != ''"> and wares_detail = #{waresDetail}</if>
+            <if test="waresCount != null "> and wares_count = #{waresCount}</if>
+            <if test="waresOutCount != null "> and wares_out_count = #{waresOutCount}</if>
+            <if test="waresStatus != null  and waresStatus != ''"> and wares_status = #{waresStatus}</if>
+            <if test="createName != null  and createName != ''"> and create_name like concat('%', #{createName}, '%')</if>
+            <if test="updateName != null  and updateName != ''"> and update_name like concat('%', #{updateName}, '%')</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectIntegralWaresById" parameterType="Long" resultMap="IntegralWaresResult">
+        <include refid="selectIntegralWaresVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertIntegralWares" parameterType="IntegralWares" useGeneratedKeys="true" keyProperty="id">
+        insert into integral_wares
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="waresType != null">wares_type,</if>
+            <if test="waresName != null">wares_name,</if>
+            <if test="saleIntegral != null">sale_integral,</if>
+            <if test="waresPic != null">wares_pic,</if>
+            <if test="waresDetail != null">wares_detail,</if>
+            <if test="waresCount != null">wares_count,</if>
+            <if test="waresOutCount != null">wares_out_count,</if>
+            <if test="waresStatus != null">wares_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createName != null">create_name,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateName != null">update_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="waresType != null">#{waresType},</if>
+            <if test="waresName != null">#{waresName},</if>
+            <if test="saleIntegral != null">#{saleIntegral},</if>
+            <if test="waresPic != null">#{waresPic},</if>
+            <if test="waresDetail != null">#{waresDetail},</if>
+            <if test="waresCount != null">#{waresCount},</if>
+            <if test="waresOutCount != null">#{waresOutCount},</if>
+            <if test="waresStatus != null">#{waresStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createName != null">#{createName},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateName != null">#{updateName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIntegralWares" parameterType="IntegralWares">
+        update integral_wares
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="waresType != null">wares_type = #{waresType},</if>
+            <if test="waresName != null">wares_name = #{waresName},</if>
+            <if test="saleIntegral != null">sale_integral = #{saleIntegral},</if>
+            <if test="waresPic != null">wares_pic = #{waresPic},</if>
+            <if test="waresDetail != null">wares_detail = #{waresDetail},</if>
+            <if test="waresCount != null">wares_count = #{waresCount},</if>
+            <if test="waresOutCount != null">wares_out_count = #{waresOutCount},</if>
+            <if test="waresStatus != null">wares_status = #{waresStatus},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createName != null">create_name = #{createName},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateName != null">update_name = #{updateName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteIntegralWaresById" parameterType="Long">
+        delete from integral_wares where id = #{id}
+    </delete>
+
+    <delete id="deleteIntegralWaresByIds" parameterType="String">
+        delete from integral_wares where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>