修改客户信息,增加，修改油站信息

.idea/encodings.xml

@@ -1,24 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-admin" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-admin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-admin/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-common" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-coupon" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-coupon/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-coupon/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-customer" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-customer/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-customer/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-framework" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-framework/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-generator" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-generator/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-generator/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-integral" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-integral/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-integral/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-market" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-market/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-market/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-quartz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-quartz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-quartz/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-station" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-station/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-station/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/yijia-system" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-system/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/yijia-system/src/main/resources" charset="UTF-8" />
   </component>

yijia-coupon/src/main/java/com/yijia/coupon/controller/CouponInfoController.java

@@ -36,7 +36,6 @@ public class CouponInfoController extends BaseController
     /**
      * 查询优惠劵列表
      */
-    @PreAuthorize("@ss.hasPermi('coupon:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(CouponInfo couponInfo)
     {
@@ -48,7 +47,6 @@ public class CouponInfoController extends BaseController
     /**
      * 导出优惠劵列表
      */
-    @PreAuthorize("@ss.hasPermi('coupon:info:export')")
     @Log(title = "优惠劵", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CouponInfo couponInfo)
@@ -61,7 +59,6 @@ public class CouponInfoController extends BaseController
     /**
      * 获取优惠劵详细信息
      */
-    @PreAuthorize("@ss.hasPermi('coupon:info:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
@@ -71,7 +68,6 @@ public class CouponInfoController extends BaseController
     /**
      * 新增优惠劵
      */
-    @PreAuthorize("@ss.hasPermi('coupon:info:add')")
     @Log(title = "优惠劵", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CouponInfo couponInfo)
@@ -82,7 +78,6 @@ public class CouponInfoController extends BaseController
     /**
      * 修改优惠劵
      */
-    @PreAuthorize("@ss.hasPermi('coupon:info:edit')")
     @Log(title = "优惠劵", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CouponInfo couponInfo)
@@ -93,7 +88,6 @@ public class CouponInfoController extends BaseController
     /**
      * 删除优惠劵
      */
-    @PreAuthorize("@ss.hasPermi('coupon:info:remove')")
     @Log(title = "优惠劵", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardRecordConsumptionController.java

@@ -3,6 +3,8 @@ package com.yijia.customer.controller;
 import java.util.List;
 
 import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 客户电子会员卡消费记录Controller
- * 
+ *
  * @author yijia
  * @date 2021-04-13
  */
@@ -92,6 +94,9 @@ public class CustomerCardRecordConsumptionController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerCardRecordConsumption customerCardRecordConsumption)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerCardRecordConsumption.setStationId(currentUser.getUser().getDeptId());
+        customerCardRecordConsumption.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerCardRecordConsumptionService.insertCustomerCardRecordConsumption(customerCardRecordConsumption));
     }
 
@@ -103,6 +108,9 @@ public class CustomerCardRecordConsumptionController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardRecordConsumption customerCardRecordConsumption)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerCardRecordConsumption.setStationId(currentUser.getUser().getDeptId());
+        customerCardRecordConsumption.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerCardRecordConsumptionService.updateCustomerCardRecordConsumption(customerCardRecordConsumption));
     }
 

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardSettingController.java

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 客户电子会员卡充值优惠设置Controller
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
@@ -46,9 +46,17 @@ public class CustomerCardSettingController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardSetting customerCardSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
+            customerCardSetting.setStationIdList(list);
+            customerCardSetting.setStationId(null);
+        }
         startPage();
-        List<CustomerCardSetting> list = customerCardSettingService.selectCustomerCardSettingList(customerCardSetting);
-        return getDataTable(list);
+        List<CustomerCardSetting> settingList = customerCardSettingService.selectCustomerCardSettingList(customerCardSetting);
+        return getDataTable(settingList);
     }
 
     /**
@@ -58,9 +66,17 @@ public class CustomerCardSettingController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(CustomerCardSetting customerCardSetting)
     {
-        List<CustomerCardSetting> list = customerCardSettingService.selectCustomerCardSettingList(customerCardSetting);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
+            customerCardSetting.setStationIdList(list);
+            customerCardSetting.setStationId(null);
+        }
+        List<CustomerCardSetting> settingList = customerCardSettingService.selectCustomerCardSettingList(customerCardSetting);
         ExcelUtil<CustomerCardSetting> util = new ExcelUtil<CustomerCardSetting>(CustomerCardSetting.class);
-        return util.exportExcel(list, "setting");
+        return util.exportExcel(settingList, "setting");
     }
 
     /**
@@ -79,6 +95,9 @@ public class CustomerCardSettingController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerCardSetting customerCardSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerCardSetting.setStationId(currentUser.getUser().getDeptId());
+        customerCardSetting.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerCardSettingService.insertCustomerCardSetting(customerCardSetting));
     }
 
@@ -89,6 +108,9 @@ public class CustomerCardSettingController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardSetting customerCardSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerCardSetting.setStationId(currentUser.getUser().getDeptId());
+        customerCardSetting.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerCardSettingService.updateCustomerCardSetting(customerCardSetting));
     }
 

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardSettingDetailController.java

@@ -1,6 +1,12 @@
 package com.yijia.customer.controller;
 
 import java.util.List;
+
+import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.customer.domain.CustomerCardSetting;
+import com.yijia.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +28,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 客户电子会员卡充值优惠设置明细Controller
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
@@ -32,41 +38,45 @@ public class CustomerCardSettingDetailController extends BaseController
 {
     @Autowired
     private ICustomerCardSettingDetailService customerCardSettingDetailService;
-
+    @Autowired
+    private ISysDeptService deptService;
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
      */
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardSettingDetail customerCardSettingDetail)
     {
+
         startPage();
-        List<CustomerCardSettingDetail> list = customerCardSettingDetailService.selectCustomerCardSettingDetailList(customerCardSettingDetail);
-        return getDataTable(list);
+        List<CustomerCardSettingDetail> detailList = customerCardSettingDetailService.selectCustomerCardSettingDetailList(customerCardSettingDetail);
+        return getDataTable(detailList);
     }
 
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
      */
+//    @GetMapping("/listDetailInfo")
+//    public TableDataInfo listDetailInfo(CustomerCardSettingDetail customerCardSettingDetail)
+//    {
+//        startPage();
+//        List<CustomerCardSettingDetail> list = customerCardSettingDetailService.listDetailInfo(customerCardSettingDetail);
+//        return getDataTable(list);
+//    }
     @GetMapping("/listDetailInfo")
-    public TableDataInfo listDetailInfo(CustomerCardSettingDetail customerCardSettingDetail)
+    public TableDataInfo listDetailInfo(CustomerCardSetting customerCardSetting)
     {
         startPage();
-        List<CustomerCardSettingDetail> list = customerCardSettingDetailService.listDetailInfo(customerCardSettingDetail);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出客户电子会员卡充值优惠设置明细列表
-     */
-    @Log(title = "客户电子会员卡充值优惠设置明细", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(CustomerCardSettingDetail customerCardSettingDetail)
-    {
-        List<CustomerCardSettingDetail> list = customerCardSettingDetailService.selectCustomerCardSettingDetailList(customerCardSettingDetail);
-        ExcelUtil<CustomerCardSettingDetail> util = new ExcelUtil<CustomerCardSettingDetail>(CustomerCardSettingDetail.class);
-        return util.exportExcel(list, "detail");
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = deptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
+            customerCardSetting.setStationIdList(list);
+            customerCardSetting.setStationId(null);
+        }
+        List<CustomerCardSettingDetail> detailList = customerCardSettingDetailService.listDetailInfo(customerCardSetting);
+        return getDataTable(detailList);
     }
-
     /**
      * 获取客户电子会员卡充值优惠设置明细详细信息
      */

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerElectronicCardController.java

@@ -26,7 +26,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 客户电子会员卡（储蓄卡）Controller
- * 
+ *
  * @author yijia
  * @date 2021-04-12
  */
@@ -86,6 +86,9 @@ public class CustomerElectronicCardController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerElectronicCard customerElectronicCard)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerElectronicCard.setStationId(currentUser.getUser().getDeptId());
+        customerElectronicCard.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerElectronicCardService.insertCustomerElectronicCard(customerElectronicCard));
     }
 
@@ -96,6 +99,9 @@ public class CustomerElectronicCardController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerElectronicCard customerElectronicCard)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerElectronicCard.setStationId(currentUser.getUser().getDeptId());
+        customerElectronicCard.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerElectronicCardService.updateCustomerElectronicCard(customerElectronicCard));
     }
 

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerGradeSettingController.java

@@ -26,7 +26,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 客户优惠等级设置Controller
- * 
+ *
  * @author yijia
  * @date 2021-01-08
  */
@@ -98,6 +98,9 @@ public class CustomerGradeSettingController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerGradeSetting customerGradeSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerGradeSetting.setStationId(currentUser.getUser().getDeptId());
+        customerGradeSetting.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerGradeSettingService.insertCustomerGradeSetting(customerGradeSetting));
     }
 
@@ -109,6 +112,9 @@ public class CustomerGradeSettingController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerGradeSetting customerGradeSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerGradeSetting.setStationId(currentUser.getUser().getDeptId());
+        customerGradeSetting.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerGradeSettingService.updateCustomerGradeSetting(customerGradeSetting));
     }
 

yijia-customer/src/main/java/com/yijia/customer/controller/CustomerManageController.java

@@ -27,7 +27,7 @@ import java.util.List;
 
 /**
  * 客户管理Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-21
  */
@@ -94,6 +94,9 @@ public class CustomerManageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerManage customerManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerManage.setStationId(currentUser.getUser().getDeptId());
+        customerManage.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerManageService.insertCustomerManage(customerManage));
     }
 
@@ -104,6 +107,9 @@ public class CustomerManageController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerManage customerManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerManage.setStationId(currentUser.getUser().getDeptId());
+        customerManage.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerManageService.updateCustomerManage(customerManage));
     }
 

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerCardRecordConsumption.java

@@ -55,7 +55,7 @@ public class CustomerCardRecordConsumption extends BaseEntity
     private BigDecimal balance;
 
     /** 油站ID */
-    private Integer stationId;
+    private Long stationId;
 
     /** 油站名称 */
     private String stationName;
@@ -162,15 +162,15 @@ public class CustomerCardRecordConsumption extends BaseEntity
     {
         return amt;
     }
-    public void setStationId(Integer stationId)
-    {
-        this.stationId = stationId;
-    }
 
-    public Integer getStationId()
-    {
+    public Long getStationId() {
         return stationId;
     }
+
+    public void setStationId(Long stationId) {
+        this.stationId = stationId;
+    }
+
     public void setStationName(String stationName)
     {
         this.stationName = stationName;

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerElectronicCard.java

@@ -10,7 +10,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 客户电子会员卡（储蓄卡）对象 customer_electronic_card
- * 
+ *
  * @author yijia
  * @date 2021-04-12
  */
@@ -55,7 +55,7 @@ public class CustomerElectronicCard extends BaseEntity
 
     /** 油站ID */
     @Excel(name = "油站ID")
-    private Integer stationId;
+    private Long stationId;
     private Integer num;
 
     /** 油站名称 */
@@ -159,106 +159,106 @@ public class CustomerElectronicCard extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setUnionId(String unionId) 
+    public void setUnionId(String unionId)
     {
         this.unionId = unionId;
     }
 
-    public String getUnionId() 
+    public String getUnionId()
     {
         return unionId;
     }
-    public void setBlogOpenid(String blogOpenid) 
+    public void setBlogOpenid(String blogOpenid)
     {
         this.blogOpenid = blogOpenid;
     }
 
-    public String getBlogOpenid() 
+    public String getBlogOpenid()
     {
         return blogOpenid;
     }
-    public void setMinaOpenid(String minaOpenid) 
+    public void setMinaOpenid(String minaOpenid)
     {
         this.minaOpenid = minaOpenid;
     }
 
-    public String getMinaOpenid() 
+    public String getMinaOpenid()
     {
         return minaOpenid;
     }
-    public void setCustomerNo(String customerNo) 
+    public void setCustomerNo(String customerNo)
     {
         this.customerNo = customerNo;
     }
 
-    public String getCustomerNo() 
+    public String getCustomerNo()
     {
         return customerNo;
     }
-    public void setCustomerName(String customerName) 
+    public void setCustomerName(String customerName)
     {
         this.customerName = customerName;
     }
 
-    public String getCustomerName() 
+    public String getCustomerName()
     {
         return customerName;
     }
-    public void setMobilePhone(String mobilePhone) 
+    public void setMobilePhone(String mobilePhone)
     {
         this.mobilePhone = mobilePhone;
     }
 
-    public String getMobilePhone() 
+    public String getMobilePhone()
     {
         return mobilePhone;
     }
-    public void setAmt(BigDecimal amt) 
+    public void setAmt(BigDecimal amt)
     {
         this.amt = amt;
     }
 
-    public BigDecimal getAmt() 
+    public BigDecimal getAmt()
     {
         return amt;
     }
-    public void setCardOilsType(String cardOilsType) 
+    public void setCardOilsType(String cardOilsType)
     {
         this.cardOilsType = cardOilsType;
     }
 
-    public String getCardOilsType() 
+    public String getCardOilsType()
     {
         return cardOilsType;
     }
-    public void setStationId(Integer stationId) 
-    {
-        this.stationId = stationId;
-    }
 
-    public Integer getStationId() 
-    {
+    public Long getStationId() {
         return stationId;
     }
-    public void setStationName(String stationName) 
+
+    public void setStationId(Long stationId) {
+        this.stationId = stationId;
+    }
+
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }
-    public void setRecentlyTime(Date recentlyTime) 
+    public void setRecentlyTime(Date recentlyTime)
     {
         this.recentlyTime = recentlyTime;
     }
 
-    public Date getRecentlyTime() 
+    public Date getRecentlyTime()
     {
         return recentlyTime;
     }

yijia-customer/src/main/java/com/yijia/customer/domain/CustomerGradeSetting.java

@@ -11,7 +11,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 客户优惠等级设置对象 customer_grade_setting
- * 
+ *
  * @author yijia
  * @date 2021-01-26
  */
@@ -23,74 +23,7 @@ public class CustomerGradeSetting extends BaseEntity
     private Long id;
 
     /** 等级 */
-    @Excel(name = "等级")
     private String grade;
-
-    /** 优惠方式 */
-    @Excel(name = "优惠方式")
-    private String discountWay;
-
-    /** 汽油优惠/L */
-    @Excel(name = "汽油优惠/L")
-    private String gasoilDiscountLitre;
-
-    /** 柴油优惠/L */
-    @Excel(name = "柴油优惠/L")
-    private String dieseloilDiscountLitre;
-
-    /** 1(固态等级设置,2动态等级-成长值规则,3动态等级-会员规则) */
-    @Excel(name = "1(固态等级设置,2动态等级-成长值规则,3动态等级-会员规则)")
-    private String gradeType;
-
-    /** 汽油消费 */
-    @Excel(name = "汽油消费")
-    private String gasoilConsume;
-
-    /** 汽油成长值 */
-    @Excel(name = "汽油成长值")
-    private String gasoilGrowthValue;
-
-    /** 柴油消费 */
-    @Excel(name = "柴油消费")
-    private String dieseloilConsume;
-
-    /** 柴油成长值 */
-    @Excel(name = "柴油成长值")
-    private String dieseloilGrowthValue;
-
-    /** 会员充值 */
-    @Excel(name = "会员充值")
-    private String memberRecharge;
-
-    /** 会员充值成长积分 */
-    @Excel(name = "会员充值成长积分")
-    private String memberGrowthValue;
-
-    /** 成长值 */
-    @Excel(name = "成长值")
-    private String growthValue;
-
-    /** 有效期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date date;
-
-    /** 到期扣除成长值 */
-    @Excel(name = "到期扣除成长值")
-    private String deductionGrowthValue;
-
-    /** 会员条件 */
-    @Excel(name = "会员条件")
-    private String memberCondit;
-
-    /** 油站id */
-    @Excel(name = "油站id")
-    private Long stationId;
-
-    /** 油站名称 */
-    @Excel(name = "油站名称")
-    private String stationName;
-
     /** 油品名称 */
     @Excel(name = "油品名称")
     private String oilName;
@@ -103,6 +36,12 @@ public class CustomerGradeSetting extends BaseEntity
     @Excel(name = "会员条件结束值")
     private Long memberConditEnd;
 
+    /** 汽油优惠/L */
+    @Excel(name = "优惠金额 元/L")
+    private String discountAmt;
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
     /**
      * 根据用户所属组织，平台，集团，油站查询条件
      */
@@ -116,194 +55,60 @@ public class CustomerGradeSetting extends BaseEntity
         this.stationIdList = stationIdList;
     }
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setGrade(String grade) 
-    {
-        this.grade = grade;
-    }
 
-    public String getGrade() 
-    {
-        return grade;
-    }
-    public void setDiscountWay(String discountWay) 
-    {
-        this.discountWay = discountWay;
-    }
-
-    public String getDiscountWay() 
-    {
-        return discountWay;
-    }
-    public void setGasoilDiscountLitre(String gasoilDiscountLitre) 
-    {
-        this.gasoilDiscountLitre = gasoilDiscountLitre;
-    }
-
-    public String getGasoilDiscountLitre() 
-    {
-        return gasoilDiscountLitre;
-    }
-    public void setDieseloilDiscountLitre(String dieseloilDiscountLitre) 
-    {
-        this.dieseloilDiscountLitre = dieseloilDiscountLitre;
-    }
-
-    public String getDieseloilDiscountLitre() 
-    {
-        return dieseloilDiscountLitre;
-    }
-    public void setGradeType(String gradeType) 
-    {
-        this.gradeType = gradeType;
-    }
-
-    public String getGradeType() 
-    {
-        return gradeType;
-    }
-    public void setGasoilConsume(String gasoilConsume) 
-    {
-        this.gasoilConsume = gasoilConsume;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getGasoilConsume() 
-    {
-        return gasoilConsume;
-    }
-    public void setGasoilGrowthValue(String gasoilGrowthValue) 
-    {
-        this.gasoilGrowthValue = gasoilGrowthValue;
+    public String getGrade() {
+        return grade;
     }
 
-    public String getGasoilGrowthValue() 
-    {
-        return gasoilGrowthValue;
-    }
-    public void setDieseloilConsume(String dieseloilConsume) 
-    {
-        this.dieseloilConsume = dieseloilConsume;
+    public void setGrade(String grade) {
+        this.grade = grade;
     }
 
-    public String getDieseloilConsume() 
-    {
-        return dieseloilConsume;
-    }
-    public void setDieseloilGrowthValue(String dieseloilGrowthValue) 
-    {
-        this.dieseloilGrowthValue = dieseloilGrowthValue;
+    public String getOilName() {
+        return oilName;
     }
 
-    public String getDieseloilGrowthValue() 
-    {
-        return dieseloilGrowthValue;
-    }
-    public void setMemberRecharge(String memberRecharge) 
-    {
-        this.memberRecharge = memberRecharge;
+    public void setOilName(String oilName) {
+        this.oilName = oilName;
     }
 
-    public String getMemberRecharge() 
-    {
-        return memberRecharge;
-    }
-    public void setMemberGrowthValue(String memberGrowthValue) 
-    {
-        this.memberGrowthValue = memberGrowthValue;
+    public Long getMemberConditStart() {
+        return memberConditStart;
     }
 
-    public String getMemberGrowthValue() 
-    {
-        return memberGrowthValue;
-    }
-    public void setGrowthValue(String growthValue) 
-    {
-        this.growthValue = growthValue;
+    public void setMemberConditStart(Long memberConditStart) {
+        this.memberConditStart = memberConditStart;
     }
 
-    public String getGrowthValue() 
-    {
-        return growthValue;
-    }
-    public void setDate(Date date) 
-    {
-        this.date = date;
+    public Long getMemberConditEnd() {
+        return memberConditEnd;
     }
 
-    public Date getDate() 
-    {
-        return date;
-    }
-    public void setDeductionGrowthValue(String deductionGrowthValue) 
-    {
-        this.deductionGrowthValue = deductionGrowthValue;
+    public void setMemberConditEnd(Long memberConditEnd) {
+        this.memberConditEnd = memberConditEnd;
     }
 
-    public String getDeductionGrowthValue() 
-    {
-        return deductionGrowthValue;
-    }
-    public void setMemberCondit(String memberCondit) 
-    {
-        this.memberCondit = memberCondit;
+    public String getDiscountAmt() {
+        return discountAmt;
     }
 
-    public String getMemberCondit() 
-    {
-        return memberCondit;
-    }
-    public void setStationId(Long stationId) 
-    {
-        this.stationId = stationId;
+    public void setDiscountAmt(String discountAmt) {
+        this.discountAmt = discountAmt;
     }
 
-    public Long getStationId() 
-    {
+    public Long getStationId() {
         return stationId;
     }
-    public void setStationName(String stationName) 
-    {
-        this.stationName = stationName;
-    }
-
-    public String getStationName() 
-    {
-        return stationName;
-    }
-    public void setOilName(String oilName) 
-    {
-        this.oilName = oilName;
-    }
-
-    public String getOilName() 
-    {
-        return oilName;
-    }
-    public void setMemberConditStart(Long memberConditStart) 
-    {
-        this.memberConditStart = memberConditStart;
-    }
-
-    public Long getMemberConditStart() 
-    {
-        return memberConditStart;
-    }
-    public void setMemberConditEnd(Long memberConditEnd) 
-    {
-        this.memberConditEnd = memberConditEnd;
-    }
 
-    public Long getMemberConditEnd() 
-    {
-        return memberConditEnd;
+    public void setStationId(Long stationId) {
+        this.stationId = stationId;
     }
 
     @Override
@@ -311,23 +116,8 @@ public class CustomerGradeSetting extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("grade", getGrade())
-            .append("discountWay", getDiscountWay())
-            .append("gasoilDiscountLitre", getGasoilDiscountLitre())
-            .append("dieseloilDiscountLitre", getDieseloilDiscountLitre())
-            .append("gradeType", getGradeType())
-            .append("gasoilConsume", getGasoilConsume())
-            .append("gasoilGrowthValue", getGasoilGrowthValue())
-            .append("dieseloilConsume", getDieseloilConsume())
-            .append("dieseloilGrowthValue", getDieseloilGrowthValue())
-            .append("memberRecharge", getMemberRecharge())
-            .append("memberGrowthValue", getMemberGrowthValue())
-            .append("growthValue", getGrowthValue())
-            .append("date", getDate())
-            .append("deductionGrowthValue", getDeductionGrowthValue())
-            .append("memberCondit", getMemberCondit())
-            .append("stationId", getStationId())
-            .append("stationName", getStationName())
             .append("oilName", getOilName())
+            .append("stationId", getStationId())
             .append("memberConditStart", getMemberConditStart())
             .append("memberConditEnd", getMemberConditEnd())
             .toString();

yijia-customer/src/main/java/com/yijia/customer/mapper/CustomerCardSettingDetailMapper.java

@@ -1,19 +1,21 @@
 package com.yijia.customer.mapper;
 
 import java.util.List;
+
+import com.yijia.customer.domain.CustomerCardSetting;
 import com.yijia.customer.domain.CustomerCardSettingDetail;
 
 /**
  * 客户电子会员卡充值优惠设置明细Mapper接口
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
-public interface CustomerCardSettingDetailMapper 
+public interface CustomerCardSettingDetailMapper
 {
     /**
      * 查询客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置明细ID
      * @return 客户电子会员卡充值优惠设置明细
      */
@@ -21,7 +23,7 @@ public interface CustomerCardSettingDetailMapper
 
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 客户电子会员卡充值优惠设置明细集合
      */
@@ -29,7 +31,7 @@ public interface CustomerCardSettingDetailMapper
 
     /**
      * 新增客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface CustomerCardSettingDetailMapper
 
     /**
      * 修改客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface CustomerCardSettingDetailMapper
 
     /**
      * 删除客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置明细ID
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface CustomerCardSettingDetailMapper
 
     /**
      * 批量删除客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -61,5 +63,5 @@ public interface CustomerCardSettingDetailMapper
 
     public void deleteCustomerCardSettingDetail(CustomerCardSettingDetail detil);
 
-    public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSettingDetail customerCardSettingDetail);
+    public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSetting customerCardSetting);
 }

yijia-customer/src/main/java/com/yijia/customer/mapper/CustomerGradeSettingMapper.java

@@ -5,15 +5,15 @@ import com.yijia.customer.domain.CustomerGradeSetting;
 
 /**
  * 客户优惠等级设置Mapper接口
- * 
+ *
  * @author yijia
  * @date 2021-01-08
  */
-public interface CustomerGradeSettingMapper 
+public interface CustomerGradeSettingMapper
 {
     /**
      * 查询客户优惠等级设置
-     * 
+     *
      * @param id 客户优惠等级设置ID
      * @return 客户优惠等级设置
      */
@@ -21,15 +21,15 @@ public interface CustomerGradeSettingMapper
 
     /**
      * 查询客户优惠等级设置列表
-     * 
+     *
      * @param customerGradeSetting 客户优惠等级设置
      * @return 客户优惠等级设置集合
      */
-    public List<CustomerGradeSetting> selectCustomerGradeSettingList(CustomerGradeSetting customerGradeSetting);
+    public List<CustomerGradeSetting> customerGradeSettingMapper(CustomerGradeSetting customerGradeSetting);
 
     /**
      * 新增客户优惠等级设置
-     * 
+     *
      * @param customerGradeSetting 客户优惠等级设置
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface CustomerGradeSettingMapper
 
     /**
      * 修改客户优惠等级设置
-     * 
+     *
      * @param customerGradeSetting 客户优惠等级设置
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface CustomerGradeSettingMapper
 
     /**
      * 删除客户优惠等级设置
-     * 
+     *
      * @param id 客户优惠等级设置ID
      * @return 结果
      */
@@ -53,10 +53,11 @@ public interface CustomerGradeSettingMapper
 
     /**
      * 批量删除客户优惠等级设置
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     public int deleteCustomerGradeSettingByIds(Long[] ids);
 
+    public List<CustomerGradeSetting> selectCustomerGradeSettingList(CustomerGradeSetting customerGradeSetting);
 }

yijia-customer/src/main/java/com/yijia/customer/service/ICustomerCardSettingDetailService.java

@@ -1,19 +1,21 @@
 package com.yijia.customer.service;
 
 import java.util.List;
+
+import com.yijia.customer.domain.CustomerCardSetting;
 import com.yijia.customer.domain.CustomerCardSettingDetail;
 
 /**
  * 客户电子会员卡充值优惠设置明细Service接口
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
-public interface ICustomerCardSettingDetailService 
+public interface ICustomerCardSettingDetailService
 {
     /**
      * 查询客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置明细ID
      * @return 客户电子会员卡充值优惠设置明细
      */
@@ -21,7 +23,7 @@ public interface ICustomerCardSettingDetailService
 
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 客户电子会员卡充值优惠设置明细集合
      */
@@ -29,7 +31,7 @@ public interface ICustomerCardSettingDetailService
 
     /**
      * 新增客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ICustomerCardSettingDetailService
 
     /**
      * 修改客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ICustomerCardSettingDetailService
 
     /**
      * 批量删除客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param ids 需要删除的客户电子会员卡充值优惠设置明细ID
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface ICustomerCardSettingDetailService
 
     /**
      * 删除客户电子会员卡充值优惠设置明细信息
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置明细ID
      * @return 结果
      */
@@ -61,8 +63,8 @@ public interface ICustomerCardSettingDetailService
 
     /**
      * 电子会员卡积分规则明细
-     * @param customerCardSettingDetail
+     * @param customerCardSetting
      * @return
      */
-    public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSettingDetail customerCardSettingDetail);
+    public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSetting customerCardSetting);
 }

yijia-customer/src/main/java/com/yijia/customer/service/impl/CustomerCardSettingDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.yijia.customer.service.impl;
 
 import java.util.List;
+
+import com.yijia.customer.domain.CustomerCardSetting;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yijia.customer.mapper.CustomerCardSettingDetailMapper;
@@ -9,19 +11,19 @@ import com.yijia.customer.service.ICustomerCardSettingDetailService;
 
 /**
  * 客户电子会员卡充值优惠设置明细Service业务层处理
- * 
+ *
  * @author yijia
  * @date 2021-04-06
  */
 @Service
-public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettingDetailService 
+public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettingDetailService
 {
     @Autowired
     private CustomerCardSettingDetailMapper customerCardSettingDetailMapper;
 
     /**
      * 查询客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置明细ID
      * @return 客户电子会员卡充值优惠设置明细
      */
@@ -33,7 +35,7 @@ public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettin
 
     /**
      * 查询客户电子会员卡充值优惠设置明细列表
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 客户电子会员卡充值优惠设置明细
      */
@@ -45,7 +47,7 @@ public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettin
 
     /**
      * 新增客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 结果
      */
@@ -57,7 +59,7 @@ public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettin
 
     /**
      * 修改客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param customerCardSettingDetail 客户电子会员卡充值优惠设置明细
      * @return 结果
      */
@@ -69,7 +71,7 @@ public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettin
 
     /**
      * 批量删除客户电子会员卡充值优惠设置明细
-     * 
+     *
      * @param ids 需要删除的客户电子会员卡充值优惠设置明细ID
      * @return 结果
      */
@@ -81,7 +83,7 @@ public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettin
 
     /**
      * 删除客户电子会员卡充值优惠设置明细信息
-     * 
+     *
      * @param id 客户电子会员卡充值优惠设置明细ID
      * @return 结果
      */
@@ -92,7 +94,7 @@ public class CustomerCardSettingDetailServiceImpl implements ICustomerCardSettin
     }
 
     @Override
-    public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSettingDetail customerCardSettingDetail) {
-        return customerCardSettingDetailMapper.listDetailInfo(customerCardSettingDetail);
+    public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSetting customerCardSetting) {
+        return customerCardSettingDetailMapper.listDetailInfo(customerCardSetting);
     }
 }

yijia-customer/src/main/resources/mapper/customer/CustomerCardSettingDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.customer.mapper.CustomerCardSettingDetailMapper">
-    
+
     <resultMap type="CustomerCardSettingDetail" id="CustomerCardSettingDetailResult">
         <result property="id"    column="id"    />
         <result property="parentId"    column="parent_id"    />
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCustomerCardSettingDetailList" parameterType="CustomerCardSettingDetail" resultMap="CustomerCardSettingDetailResult">
         <include refid="selectCustomerCardSettingDetailVo"/>
-        <where>  
+        <where>
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="settingRuleType != null  and settingRuleType != ''"> and setting_rule_type = #{settingRuleType}</if>
             <if test="discountAmtStart != null "> and discount_amt_start = #{discountAmtStart}</if>
@@ -48,18 +48,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="listDetailInfo" parameterType="CustomerCardSettingDetail" resultMap="CustomerCardSettingDetailResult">
+    <select id="listDetailInfo" parameterType="CustomerCardSetting" resultMap="CustomerCardSettingDetailResult">
         SELECT a.setting_rule_type,a.discount_amt_start,a.discount_amt_end,a.present_amt,oil_name,b.card_oils_type,
         b.discount_time_setting,b.discount_time_type,b.is_discount_coupon,b.is_market,b.is_grade_setting,b.present_scale,b.enjoy_integral_multiple
         from customer_card_setting_detail a join customer_card_setting b on a.parent_id= b.id
         <where>
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
-            <if test="settingRuleType != null  and settingRuleType != ''"> and setting_rule_type = #{settingRuleType}</if>
-            <if test="discountAmtStart != null "> and discount_amt_start = #{discountAmtStart}</if>
-            <if test="discountAmtEnd != null "> and discount_amt_end = #{discountAmtEnd}</if>
-            <if test="presentAmt != null "> and present_amt = #{presentAmt}</if>
-            <if test="oilName != null "> and oil_name = #{oilName}</if>
-            <if test="status != null "> and status = #{status}</if>
+<!--            <if test="parentId != null "> and parent_id = #{parentId}</if>-->
+<!--            <if test="settingRuleType != null  and settingRuleType != ''"> and setting_rule_type = #{settingRuleType}</if>-->
+<!--            <if test="discountAmtStart != null "> and discount_amt_start = #{discountAmtStart}</if>-->
+<!--            <if test="discountAmtEnd != null "> and discount_amt_end = #{discountAmtEnd}</if>-->
+<!--            <if test="presentAmt != null "> and present_amt = #{presentAmt}</if>-->
+<!--            <if test="oilName != null "> and oil_name = #{oilName}</if>-->
+<!--            <if test="status != null "> and status = #{status}</if>-->
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -69,12 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-    
+
     <select id="selectCustomerCardSettingDetailById" parameterType="Long" resultMap="CustomerCardSettingDetailResult">
         <include refid="selectCustomerCardSettingDetailVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertCustomerCardSettingDetail" parameterType="CustomerCardSettingDetail">
         insert into customer_card_setting_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCustomerCardSettingDetailByIds" parameterType="String">
-        delete from customer_card_setting_detail where id in 
+        delete from customer_card_setting_detail where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -135,4 +135,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null"> and status = #{status}</if>
         </where>
     </delete>
-</mapper>
+</mapper>

yijia-customer/src/main/resources/mapper/customer/CustomerGradeSettingMapper.xml

@@ -3,55 +3,27 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.customer.mapper.CustomerGradeSettingMapper">
-    
+
     <resultMap type="CustomerGradeSetting" id="CustomerGradeSettingResult">
         <result property="id"    column="id"    />
         <result property="grade"    column="grade"    />
-        <result property="discountWay"    column="discount_way"    />
-        <result property="gasoilDiscountLitre"    column="gasoil_discount_litre"    />
-        <result property="dieseloilDiscountLitre"    column="dieseloil_discount_litre"    />
-        <result property="gradeType"    column="grade_type"    />
-        <result property="gasoilConsume"    column="gasoil_consume"    />
-        <result property="gasoilGrowthValue"    column="gasoil_growth_value"    />
-        <result property="dieseloilConsume"    column="dieseloil_consume"    />
-        <result property="dieseloilGrowthValue"    column="dieseloil_growth_value"    />
-        <result property="memberRecharge"    column="member_recharge"    />
-        <result property="memberGrowthValue"    column="member_growth_value"    />
-        <result property="growthValue"    column="growth_value"    />
-        <result property="date"    column="date"    />
-        <result property="deductionGrowthValue"    column="deduction_growth_value"    />
-        <result property="memberCondit"    column="member_condit"    />
-        <result property="stationId"    column="station_id"    />
-        <result property="stationName"    column="station_name"    />
         <result property="oilName"    column="oil_name"    />
         <result property="memberConditStart"    column="member_condit_start"    />
         <result property="memberConditEnd"    column="member_condit_end"    />
+        <result property="discountAmt"    column="discount_amt"    />
+        <result property="stationId"    column="station_id"    />
     </resultMap>
 
     <sql id="selectCustomerGradeSettingVo">
-        select id, grade, discount_way, gasoil_discount_litre, dieseloil_discount_litre, grade_type, gasoil_consume, gasoil_growth_value, dieseloil_consume, dieseloil_growth_value, member_recharge, member_growth_value, growth_value, date, deduction_growth_value, member_condit, station_id, station_name, oil_name, member_condit_start, member_condit_end from customer_grade_setting
+        select id, grade, discount_amt, station_id, oil_name, member_condit_start, member_condit_end from customer_grade_setting
     </sql>
 
     <select id="selectCustomerGradeSettingList" parameterType="CustomerGradeSetting" resultMap="CustomerGradeSettingResult">
         <include refid="selectCustomerGradeSettingVo"/>
         <where>
             <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
-            <if test="discountWay != null  and discountWay != ''"> and discount_way = #{discountWay}</if>
-            <if test="gasoilDiscountLitre != null  and gasoilDiscountLitre != ''"> and gasoil_discount_litre = #{gasoilDiscountLitre}</if>
-            <if test="dieseloilDiscountLitre != null  and dieseloilDiscountLitre != ''"> and dieseloil_discount_litre = #{dieseloilDiscountLitre}</if>
-            <if test="gradeType != null  and gradeType != ''"> and grade_type = #{gradeType}</if>
-            <if test="gasoilConsume != null  and gasoilConsume != ''"> and gasoil_consume = #{gasoilConsume}</if>
-            <if test="gasoilGrowthValue != null  and gasoilGrowthValue != ''"> and gasoil_growth_value = #{gasoilGrowthValue}</if>
-            <if test="dieseloilConsume != null  and dieseloilConsume != ''"> and dieseloil_consume = #{dieseloilConsume}</if>
-            <if test="dieseloilGrowthValue != null  and dieseloilGrowthValue != ''"> and dieseloil_growth_value = #{dieseloilGrowthValue}</if>
-            <if test="memberRecharge != null  and memberRecharge != ''"> and member_recharge = #{memberRecharge}</if>
-            <if test="memberGrowthValue != null  and memberGrowthValue != ''"> and member_growth_value = #{memberGrowthValue}</if>
-            <if test="growthValue != null  and growthValue != ''"> and growth_value = #{growthValue}</if>
-            <if test="date != null "> and date = #{date}</if>
-            <if test="deductionGrowthValue != null  and deductionGrowthValue != ''"> and deduction_growth_value = #{deductionGrowthValue}</if>
-            <if test="memberCondit != null  and memberCondit != ''"> and member_condit = #{memberCondit}</if>
+            <if test="discountAmt != null  and discountAmt != ''"> and discount_amt = #{discountAmt}</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="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
             <if test="memberConditStart != null "> and member_condit_start = #{memberConditStart}</if>
             <if test="memberConditEnd != null "> and member_condit_end = #{memberConditEnd}</if>
@@ -70,49 +42,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCustomerGradeSettingVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertCustomerGradeSetting" parameterType="CustomerGradeSetting" useGeneratedKeys="true" keyProperty="id">
         insert into customer_grade_setting
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="grade != null">grade,</if>
-            <if test="discountWay != null">discount_way,</if>
-            <if test="gasoilDiscountLitre != null">gasoil_discount_litre,</if>
-            <if test="dieseloilDiscountLitre != null">dieseloil_discount_litre,</if>
-            <if test="gradeType != null">grade_type,</if>
-            <if test="gasoilConsume != null">gasoil_consume,</if>
-            <if test="gasoilGrowthValue != null">gasoil_growth_value,</if>
-            <if test="dieseloilConsume != null">dieseloil_consume,</if>
-            <if test="dieseloilGrowthValue != null">dieseloil_growth_value,</if>
-            <if test="memberRecharge != null">member_recharge,</if>
-            <if test="memberGrowthValue != null">member_growth_value,</if>
-            <if test="growthValue != null">growth_value,</if>
-            <if test="date != null">date,</if>
-            <if test="deductionGrowthValue != null">deduction_growth_value,</if>
-            <if test="memberCondit != null">member_condit,</if>
+            <if test="discountAmt != null">discount_amt,</if>
             <if test="stationId != null">station_id,</if>
-            <if test="stationName != null">station_name,</if>
             <if test="oilName != null">oil_name,</if>
             <if test="memberConditStart != null">member_condit_start,</if>
             <if test="memberConditEnd != null">member_condit_end,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="grade != null">#{grade},</if>
-            <if test="discountWay != null">#{discountWay},</if>
-            <if test="gasoilDiscountLitre != null">#{gasoilDiscountLitre},</if>
-            <if test="dieseloilDiscountLitre != null">#{dieseloilDiscountLitre},</if>
-            <if test="gradeType != null">#{gradeType},</if>
-            <if test="gasoilConsume != null">#{gasoilConsume},</if>
-            <if test="gasoilGrowthValue != null">#{gasoilGrowthValue},</if>
-            <if test="dieseloilConsume != null">#{dieseloilConsume},</if>
-            <if test="dieseloilGrowthValue != null">#{dieseloilGrowthValue},</if>
-            <if test="memberRecharge != null">#{memberRecharge},</if>
-            <if test="memberGrowthValue != null">#{memberGrowthValue},</if>
-            <if test="growthValue != null">#{growthValue},</if>
-            <if test="date != null">#{date},</if>
-            <if test="deductionGrowthValue != null">#{deductionGrowthValue},</if>
-            <if test="memberCondit != null">#{memberCondit},</if>
+            <if test="discountAmt != null">discount_amt,</if>
             <if test="stationId != null">#{stationId},</if>
-            <if test="stationName != null">#{stationName},</if>
             <if test="oilName != null">#{oilName},</if>
             <if test="memberConditStart != null">#{memberConditStart},</if>
             <if test="memberConditEnd != null">#{memberConditEnd},</if>
@@ -123,25 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update customer_grade_setting
         <trim prefix="SET" suffixOverrides=",">
             <if test="grade != null">grade = #{grade},</if>
-            <if test="discountWay != null">discount_way = #{discountWay},</if>
-            <if test="gasoilDiscountLitre != null">gasoil_discount_litre = #{gasoilDiscountLitre},</if>
-            <if test="dieseloilDiscountLitre != null">dieseloil_discount_litre = #{dieseloilDiscountLitre},</if>
-            <if test="gradeType != null">grade_type = #{gradeType},</if>
-            <if test="gasoilConsume != null">gasoil_consume = #{gasoilConsume},</if>
-            <if test="gasoilGrowthValue != null">gasoil_growth_value = #{gasoilGrowthValue},</if>
-            <if test="dieseloilConsume != null">dieseloil_consume = #{dieseloilConsume},</if>
-            <if test="dieseloilGrowthValue != null">dieseloil_growth_value = #{dieseloilGrowthValue},</if>
-            <if test="memberRecharge != null">member_recharge = #{memberRecharge},</if>
-            <if test="memberGrowthValue != null">member_growth_value = #{memberGrowthValue},</if>
-            <if test="growthValue != null">growth_value = #{growthValue},</if>
-            <if test="date != null">date = #{date},</if>
-            <if test="deductionGrowthValue != null">deduction_growth_value = #{deductionGrowthValue},</if>
-            <if test="memberCondit != null">member_condit = #{memberCondit},</if>
-            <if test="stationId != null">station_id = #{stationId},</if>
-            <if test="stationName != null">station_name = #{stationName},</if>
             <if test="oilName != null">oil_name = #{oilName},</if>
             <if test="memberConditStart != null">member_condit_start = #{memberConditStart},</if>
             <if test="memberConditEnd != null">member_condit_end = #{memberConditEnd},</if>
+            <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -151,10 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCustomerGradeSettingByIds" parameterType="String">
-        delete from customer_grade_setting where id in 
+        delete from customer_grade_setting where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

yijia-framework/src/main/java/com/yijia/framework/config/CaptchaConfig.java

@@ -9,7 +9,7 @@ import static com.google.code.kaptcha.Constants.*;
 
 /**
  * 验证码配置
- * 
+ *
  * @author yijia
  */
 @Configuration
@@ -63,7 +63,7 @@ public class CaptchaConfig
         // KAPTCHA_SESSION_KEY
         properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
         // 验证码文本生成器
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "KaptchaTextCreator");
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.yijia.framework.config.KaptchaTextCreator");
         // 验证码文本字符间距 默认为2
         properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
         // 验证码文本字符长度 默认为5

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

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 用户积分Controller
- * 
+ *
  * @author yijia
  * @date 2021-02-24
  */
@@ -94,6 +94,9 @@ public class CustomerPointsController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerPoints customerPoints)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerPoints.setStationId(currentUser.getUser().getDeptId());
+        customerPoints.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerPointsService.insertCustomerPoints(customerPoints));
     }
 
@@ -104,6 +107,9 @@ public class CustomerPointsController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerPoints customerPoints)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerPoints.setStationId(currentUser.getUser().getDeptId());
+        customerPoints.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerPointsService.updateCustomerPoints(customerPoints));
     }
 

yijia-integral/src/main/java/com/yijia/integral/controller/CustomerPointsRecordController.java

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 客户积分记录Controller
- * 
+ *
  * @author yijia
  * @date 2021-03-17
  */
@@ -94,6 +94,9 @@ public class CustomerPointsRecordController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CustomerPointsRecord customerPointsRecord)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerPointsRecord.setStationId(currentUser.getUser().getDeptId());
+        customerPointsRecord.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerPointsRecordService.insertCustomerPointsRecord(customerPointsRecord));
     }
 
@@ -104,6 +107,9 @@ public class CustomerPointsRecordController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerPointsRecord customerPointsRecord)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        customerPointsRecord.setStationId(currentUser.getUser().getDeptId());
+        customerPointsRecord.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(customerPointsRecordService.updateCustomerPointsRecord(customerPointsRecord));
     }
 

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

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 积分消费订单Controller
- * 
+ *
  * @author yijia
  * @date 2021-02-24
  */
@@ -94,6 +94,9 @@ public class IntegralOrderController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody IntegralOrder integralOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralOrder.setStationId(currentUser.getUser().getDeptId());
+        integralOrder.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(integralOrderService.insertIntegralOrder(integralOrder));
     }
 
@@ -104,6 +107,9 @@ public class IntegralOrderController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody IntegralOrder integralOrder)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralOrder.setStationId(currentUser.getUser().getDeptId());
+        integralOrder.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(integralOrderService.updateIntegralOrder(integralOrder));
     }
 

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

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 积分规则Controller
- * 
+ *
  * @author yijia
  * @date 2021-02-24
  */
@@ -129,6 +129,9 @@ public class IntegralRuleController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody IntegralRule integralRule)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralRule.setStationId(currentUser.getUser().getDeptId());
+        integralRule.setStationName(currentUser.getUser().getDept().getDeptName());
         if(integralRule!=null && integralRule.getIntegralActivity()==null){
             integralRule.setIntegralActivity("0");
         }
@@ -142,6 +145,9 @@ public class IntegralRuleController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody IntegralRule integralRule)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralRule.setStationId(currentUser.getUser().getDeptId());
+        integralRule.setStationName(currentUser.getUser().getDept().getDeptName());
         if(integralRule!=null && integralRule.getIntegralActivity()==null){
             integralRule.setIntegralActivity("0");
         }

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

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 积分商城图片信息Controller
- * 
+ *
  * @author yijia
  * @date 2021-03-18
  */
@@ -97,6 +97,9 @@ public class IntegralShopPicController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody IntegralShopPic integralShopPic)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralShopPic.setStationId(currentUser.getUser().getDeptId());
+        integralShopPic.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(integralShopPicService.insertIntegralShopPic(integralShopPic));
     }
 
@@ -108,6 +111,9 @@ public class IntegralShopPicController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody IntegralShopPic integralShopPic)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        integralShopPic.setStationId(currentUser.getUser().getDeptId());
+        integralShopPic.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(integralShopPicService.updateIntegralShopPic(integralShopPic));
     }
 

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

@@ -27,7 +27,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 【请填写功能名称】Controller
- * 
+ *
  * @author yijia
  * @date 2021-03-01
  */
@@ -97,6 +97,8 @@ public class IntegralWaresController extends BaseController
         LoginUser currentUser = SecurityUtils.getLoginUser();
         integralWares.setCreateName(currentUser.getUsername());
         integralWares.setCreateBy(currentUser.getUser().getUserId().toString());
+        integralWares.setStationId(currentUser.getUser().getDeptId());
+        integralWares.setStationName(currentUser.getUser().getDept().getDeptName());
         integralWares.setWaresStatus("1");
         return toAjax(integralWaresService.insertIntegralWares(integralWares));
     }
@@ -110,6 +112,8 @@ public class IntegralWaresController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         integralWares.setUpdateName(currentUser.getUsername());
+        integralWares.setStationId(currentUser.getUser().getDeptId());
+        integralWares.setStationName(currentUser.getUser().getDept().getDeptName());
         integralWares.setUpdateBy(currentUser.getUser().getUserId().toString());
         return toAjax(integralWaresService.updateIntegralWares(integralWares));
     }

yijia-market/src/main/java/com/yijia/market/controller/MarkertPlanController.java

@@ -29,7 +29,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 营销方案Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-22
  */
@@ -96,6 +96,9 @@ public class MarkertPlanController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MarkertPlan markertPlan)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        markertPlan.setStationId(currentUser.getUser().getDeptId());
+        markertPlan.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(markertPlanService.insertMarkertPlan(markertPlan));
     }
 
@@ -106,6 +109,9 @@ public class MarkertPlanController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MarkertPlan markertPlan)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        markertPlan.setStationId(currentUser.getUser().getDeptId());
+        markertPlan.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(markertPlanService.updateMarkertPlan(markertPlan));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationDeviceManageController.java

@@ -30,7 +30,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油站设备管理Controller
- * 
+ *
  * @author yijia
  * @date 2021-01-13
  */
@@ -99,6 +99,9 @@ public class StationDeviceManageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StationDeviceManage stationDeviceManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationDeviceManage.setStationId(currentUser.getUser().getDeptId());
+        stationDeviceManage.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationDeviceManageService.insertStationDeviceManage(stationDeviceManage));
     }
 
@@ -109,6 +112,9 @@ public class StationDeviceManageController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationDeviceManage stationDeviceManage)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationDeviceManage.setStationId(currentUser.getUser().getDeptId());
+        stationDeviceManage.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationDeviceManageService.updateStationDeviceManage(stationDeviceManage));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationOilGunController.java

@@ -34,7 +34,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油枪管理Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-09
  */
@@ -120,6 +120,9 @@ public class StationOilGunController extends BaseController
     @Log(title = "油枪管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StationOilGun stationOilGun) throws ParseException {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        stationOilGun.setStationName(currentUser.getUser().getDept().getDeptName());
         Date date=new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String time = sdf.format(date);
@@ -135,6 +138,9 @@ public class StationOilGunController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationOilGun stationOilGun)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        stationOilGun.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationOilGunService.updateStationOilGun(stationOilGun));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationOilPriceAdjustController.java

@@ -37,7 +37,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油品调价信息Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-09
  */
@@ -112,6 +112,8 @@ public class StationOilPriceAdjustController extends BaseController
         LoginUser currentUser = SecurityUtils.getLoginUser();
         stationOilPriceAdjust.setOperator(currentUser.getUsername());
         stationOilPriceAdjust.setStatus("1");
+        stationOilPriceAdjust.setStationId(currentUser.getUser().getDeptId());
+        stationOilPriceAdjust.setStationName(currentUser.getUser().getDept().getDeptName());
        int i= stationOilPriceAdjustService.insertStationOilPriceAdjust(stationOilPriceAdjust);
        //查询出刚添加的油品调价信息
         if(stationOilPriceAdjust.getTakeEffectStatus()!=null && stationOilPriceAdjust.getTakeEffectStatus().equals("1")){
@@ -151,6 +153,9 @@ public class StationOilPriceAdjustController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationOilPriceAdjust stationOilPriceAdjust)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationOilPriceAdjust.setStationId(currentUser.getUser().getDeptId());
+        stationOilPriceAdjust.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationOilPriceAdjustService.updateStationOilPriceAdjust(stationOilPriceAdjust));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationOilPriceController.java

@@ -33,7 +33,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油品价格Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-08
  */
@@ -106,6 +106,9 @@ public class StationOilPriceController extends BaseController
         String time = sdf.format(date);
         Date  now = sdf.parse(time);
         stationOilPrice.setDate(now);
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationOilPrice.setStationId(currentUser.getUser().getDeptId());
+        stationOilPrice.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationOilPriceService.insertStationOilPrice(stationOilPrice));
     }
 
@@ -116,6 +119,9 @@ public class StationOilPriceController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationOilPrice stationOilPrice)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationOilPrice.setStationId(currentUser.getUser().getDeptId());
+        stationOilPrice.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationOilPriceService.updateStationOilPrice(stationOilPrice));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationPayController.java

@@ -31,7 +31,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油站支付设置Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-10
  */
@@ -150,6 +150,9 @@ public class StationPayController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StationPay stationPay)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPay.setStationId(currentUser.getUser().getDeptId());
+        stationPay.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPayService.insertStationPay(stationPay));
     }
 
@@ -160,6 +163,9 @@ public class StationPayController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationPay stationPay)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPay.setStationId(currentUser.getUser().getDeptId());
+        stationPay.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPayService.updateStationPay(stationPay));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationPersonnelController.java

@@ -29,7 +29,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油站员工信息Controller
- * 
+ *
  * @author yijia
  * @date 2020-12-09
  */
@@ -98,6 +98,9 @@ public class StationPersonnelController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StationPersonnel stationPersonnel)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPersonnel.setStationId(currentUser.getUser().getDeptId());
+        stationPersonnel.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPersonnelService.insertStationPersonnel(stationPersonnel));
     }
 
@@ -108,6 +111,9 @@ public class StationPersonnelController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationPersonnel stationPersonnel)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPersonnel.setStationId(currentUser.getUser().getDeptId());
+        stationPersonnel.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPersonnelService.updateStationPersonnel(stationPersonnel));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationPicController.java

@@ -1,6 +1,9 @@
 package com.yijia.station.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;
@@ -22,7 +25,7 @@ import com.yijia.common.core.page.TableDataInfo;
 
 /**
  * 油站支付管理图片Controller
- * 
+ *
  * @author yijia
  * @date 2021-03-19
  */
@@ -72,6 +75,9 @@ public class StationPicController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody StationPic stationPic)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPic.setStationId(currentUser.getUser().getDeptId());
+        stationPic.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPicService.insertStationPic(stationPic));
     }
 
@@ -82,6 +88,9 @@ public class StationPicController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody StationPic stationPic)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPic.setStationId(currentUser.getUser().getDeptId());
+        stationPic.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPicService.updateStationPic(stationPic));
     }
 

yijia-station/src/main/java/com/yijia/station/domain/StationDeviceManage.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 油站设备管理对象 station_device_manage
- * 
+ *
  * @author yijia
  * @date 2021-01-13
  */
@@ -55,6 +55,33 @@ public class StationDeviceManage extends BaseEntity
     /** 设备厂家 */
     @Excel(name = "设备厂家")
     private String deviceFactory;
+
+    /**
+     * 交换机名字
+     */
+    private String posFanoutExchange;
+
+    /**
+     * 队列名
+     */
+    private String posQueue;
+
+    public String getPosFanoutExchange() {
+        return posFanoutExchange;
+    }
+
+    public void setPosFanoutExchange(String posFanoutExchange) {
+        this.posFanoutExchange = posFanoutExchange;
+    }
+
+    public String getPosQueue() {
+        return posQueue;
+    }
+
+    public void setPosQueue(String posQueue) {
+        this.posQueue = posQueue;
+    }
+
     /**
      * 根据用户所属组织，平台，集团，油站查询条件
      */
@@ -73,88 +100,88 @@ public class StationDeviceManage extends BaseEntity
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
+    public Long getDeviceId()
     {
         return deviceId;
     }
-    public void setDeviceNo(String deviceNo) 
+    public void setDeviceNo(String deviceNo)
     {
         this.deviceNo = deviceNo;
     }
 
-    public String getDeviceNo() 
+    public String getDeviceNo()
     {
         return deviceNo;
     }
-    public void setDeviceName(String deviceName) 
+    public void setDeviceName(String deviceName)
     {
         this.deviceName = deviceName;
     }
 
-    public String getDeviceName() 
+    public String getDeviceName()
     {
         return deviceName;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setStationName(String stationName) 
+    public void setStationName(String stationName)
     {
         this.stationName = stationName;
     }
 
-    public String getStationName() 
+    public String getStationName()
     {
         return stationName;
     }
-    public void setDeviceType(String deviceType) 
+    public void setDeviceType(String deviceType)
     {
         this.deviceType = deviceType;
     }
 
-    public String getDeviceType() 
+    public String getDeviceType()
     {
         return deviceType;
     }
-    public void setDeviceSerialNum(String deviceSerialNum) 
+    public void setDeviceSerialNum(String deviceSerialNum)
     {
         this.deviceSerialNum = deviceSerialNum;
     }
 
-    public String getDeviceSerialNum() 
+    public String getDeviceSerialNum()
     {
         return deviceSerialNum;
     }
-    public void setGunNo(String gunNo) 
+    public void setGunNo(String gunNo)
     {
         this.gunNo = gunNo;
     }
 
-    public String getGunNo() 
+    public String getGunNo()
     {
         return gunNo;
     }
-    public void setDeviceStatus(String deviceStatus) 
+    public void setDeviceStatus(String deviceStatus)
     {
         this.deviceStatus = deviceStatus;
     }
 
-    public String getDeviceStatus() 
+    public String getDeviceStatus()
     {
         return deviceStatus;
     }
-    public void setDeviceFactory(String deviceFactory) 
+    public void setDeviceFactory(String deviceFactory)
     {
         this.deviceFactory = deviceFactory;
     }
 
-    public String getDeviceFactory() 
+    public String getDeviceFactory()
     {
         return deviceFactory;
     }

yijia-station/src/main/java/com/yijia/station/domain/StationOilPrice.java

@@ -12,7 +12,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 油品价格对象 station_oil_price
- * 
+ *
  * @author yijia
  * @date 2020-12-08
  */
@@ -37,13 +37,14 @@ public class StationOilPrice extends BaseEntity
 
     /** 油站名称 */
     @Excel(name = "油站名称")
-    private String stationNanme;
+    private String stationName;
 
     /** 操作时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date date;
 
+
     /**
      * 根据用户所属组织，平台，集团，油站查询条件
      */
@@ -62,16 +63,16 @@ public class StationOilPrice extends BaseEntity
         this.oilPriceId = oilPriceId;
     }
 
-    public Long getOilPriceId() 
+    public Long getOilPriceId()
     {
         return oilPriceId;
     }
-    public void setOilName(String oilName) 
+    public void setOilName(String oilName)
     {
         this.oilName = oilName;
     }
 
-    public String getOilName() 
+    public String getOilName()
     {
         return oilName;
     }
@@ -89,29 +90,30 @@ public class StationOilPrice extends BaseEntity
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setStationNanme(String stationNanme) 
-    {
-        this.stationNanme = stationNanme;
+
+
+    public String getStationName() {
+        return stationName;
     }
 
-    public String getStationNanme() 
-    {
-        return stationNanme;
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
     }
-    public void setDate(Date date) 
+    public void setDate(Date date)
     {
         this.date = date;
     }
 
-    public Date getDate() 
+    public Date getDate()
     {
         return date;
     }
 
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -119,7 +121,7 @@ public class StationOilPrice extends BaseEntity
             .append("oilName", getOilName())
             .append("oilPrice", getOilPrice())
             .append("stationId", getStationId())
-            .append("stationNanme", getStationNanme())
+            .append("stationName",getStationName())
             .append("date", getDate())
             .toString();
     }

yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
-            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer like concat('%', #{consumer}, '%')</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
             <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
@@ -158,8 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdDate != null "> and created_date = #{createdDate}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
-            <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
-            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and customer_phone like concat('%',#{customerPhone}, '%') </if>
+            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade like concat('%',#{customerGrade}, '%') </if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"

yijia-station/src/main/resources/mapper/station/StationDeviceManageMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.station.mapper.StationDeviceManageMapper">
-    
+
     <resultMap type="StationDeviceManage" id="StationDeviceManageResult">
         <result property="deviceId"    column="device_id"    />
         <result property="deviceNo"    column="device_no"    />
@@ -15,15 +15,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gunNo"    column="gun_no"    />
         <result property="deviceStatus"    column="device_status"    />
         <result property="deviceFactory"    column="device_factory"    />
+        <result property="posFanoutExchange"    column="pos_fanout_exchange"    />
+        <result property="posQueue"    column="pos_queue"    />
     </resultMap>
 
     <sql id="selectStationDeviceManageVo">
-        select device_id, device_no, device_name, station_id, station_name, device_type, device_serial_num, gun_no, device_status, device_factory from station_device_manage
+        select device_id, device_no, device_name, station_id, station_name, device_type, device_serial_num, gun_no,pos_fanout_exchange, pos_queue,device_status, device_factory from station_device_manage
     </sql>
 
     <select id="selectStationDeviceManageList" parameterType="StationDeviceManage" resultMap="StationDeviceManageResult">
         <include refid="selectStationDeviceManageVo"/>
-        <where>  
+        <where>
             <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
@@ -33,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
             <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
             <if test="deviceFactory != null  and deviceFactory != ''"> and device_factory = #{deviceFactory}</if>
+            <if test="posFanoutExchange != null  and posFanoutExchange != ''"> and pos_fanout_exchange = #{posFanoutExchange}</if>
+            <if test="posQueue != null  and posQueue != ''"> and pos_queue = #{posQueue}</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -43,12 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by device_id desc
     </select>
-    
+
     <select id="selectStationDeviceManageById" parameterType="Long" resultMap="StationDeviceManageResult">
         <include refid="selectStationDeviceManageVo"/>
         where device_id = #{deviceId}
     </select>
-        
+
     <insert id="insertStationDeviceManage" parameterType="StationDeviceManage" useGeneratedKeys="true" keyProperty="deviceId">
         insert into station_device_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -61,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gunNo != null">gun_no,</if>
             <if test="deviceStatus != null">device_status,</if>
             <if test="deviceFactory != null">device_factory,</if>
+            <if test="posFanoutExchange != null">pos_fanout_exchange,</if>
+            <if test="posQueue != null">pos_queue,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceNo != null">#{deviceNo},</if>
@@ -72,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gunNo != null">#{gunNo},</if>
             <if test="deviceStatus != null">#{deviceStatus},</if>
             <if test="deviceFactory != null">#{deviceFactory},</if>
+            <if test="posFanoutExchange != null">#{posFanoutExchange},</if>
+            <if test="posQueue != null">#{posQueue},</if>
          </trim>
     </insert>
 
@@ -87,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gunNo != null">gun_no = #{gunNo},</if>
             <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
             <if test="deviceFactory != null">device_factory = #{deviceFactory},</if>
+            <if test="posFanoutExchange != null">pos_fanout_exchange= #{posFanoutExchange},</if>
+            <if test="posQueue != null">pos_queue=#{posQueue},</if>
         </trim>
         where device_id = #{deviceId}
     </update>
@@ -116,4 +126,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </where>
         );
     </select>
-</mapper>
+</mapper>

yijia-station/src/main/resources/mapper/station/StationOilPriceMapper.xml

@@ -3,27 +3,27 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.station.mapper.StationOilPriceMapper">
-    
+
     <resultMap type="StationOilPrice" id="StationOilPriceResult">
         <result property="oilPriceId"    column="oil_price_id"    />
         <result property="oilName"    column="oil_name"    />
         <result property="oilPrice"    column="oil_price"    />
         <result property="stationId"    column="station_id"    />
-        <result property="stationNanme"    column="station_nanme"    />
+        <result property="stationName"    column="station_name"    />
         <result property="date"    column="date"    />
     </resultMap>
 
     <sql id="selectStationOilPriceVo">
-        select oil_price_id, oil_name, oil_price, station_id, station_nanme, date from station_oil_price
+        select oil_price_id, oil_name, oil_price, station_id, station_name, date from station_oil_price
     </sql>
 
     <select id="selectStationOilPriceList" parameterType="StationOilPrice" resultMap="StationOilPriceResult">
         <include refid="selectStationOilPriceVo"/>
-        <where>  
+        <where>
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
             <if test="oilPrice != null  and oilPrice != ''"> and oil_price = #{oilPrice}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name = #{stationName}</if>
             <if test="date != null "> and date = #{date}</if>
             <if test="stationIdList != null ">
                 and station_id in
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
             <if test="oilPrice != null  and oilPrice != ''"> and oil_price = #{oilPrice}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name = #{stationName}</if>
             <if test="date != null "> and date = #{date}</if>
             <if test="stationIdList != null ">
                 and station_id in
@@ -53,26 +53,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    
+
     <select id="selectStationOilPriceById" parameterType="Long" resultMap="StationOilPriceResult">
         <include refid="selectStationOilPriceVo"/>
         where oil_price_id = #{oilPriceId}
     </select>
-        
+
     <insert id="insertStationOilPrice" parameterType="StationOilPrice" useGeneratedKeys="true" keyProperty="oilPriceId">
         insert into station_oil_price
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="oilName != null">oil_name,</if>
             <if test="oilPrice != null">oil_price,</if>
             <if test="stationId != null">station_id,</if>
-            <if test="stationNanme != null">station_nanme,</if>
+            <if test="stationName != null">station_name,</if>
             <if test="date != null">date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="oilName != null">#{oilName},</if>
             <if test="oilPrice != null">#{oilPrice},</if>
             <if test="stationId != null">#{stationId},</if>
-            <if test="stationNanme != null">#{stationNanme},</if>
+            <if test="stationName != null">#{stationName},</if>
             <if test="date != null">#{date},</if>
          </trim>
     </insert>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oilName != null">oil_name = #{oilName},</if>
             <if test="oilPrice != null">oil_price = #{oilPrice},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
-            <if test="stationNanme != null">station_nanme = #{stationNanme},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
             <if test="date != null">date = #{date},</if>
         </trim>
         where oil_price_id = #{oilPriceId}
@@ -94,10 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteStationOilPriceByIds" parameterType="String">
-        delete from station_oil_price where oil_price_id in 
+        delete from station_oil_price where oil_price_id in
         <foreach item="oilPriceId" collection="array" open="(" separator="," close=")">
             #{oilPriceId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -27,8 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="stationLongitude"    column="station_longitude"    />
 		<result property="stationLatitude"    column="station_latitude"    />
 		<result property="mno"    column="mno"    />
-		<result property="appId"    column="app_id"    />
-		<result property="appSecret"    column="app_secret"    />
 	</resultMap>
 	
 	<sql id="selectDeptVo">