修改电子卡管理，客户信息设置

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

@@ -79,7 +79,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 获取客户电子会员卡消费记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -89,7 +88,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 新增客户电子会员卡消费记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:add')")
     @Log(title = "客户电子会员卡消费记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerCardRecordConsumption customerCardRecordConsumption)
@@ -103,7 +101,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 修改客户电子会员卡消费记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:edit')")
     @Log(title = "客户电子会员卡消费记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardRecordConsumption customerCardRecordConsumption)
@@ -117,7 +114,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 删除客户电子会员卡消费记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:remove')")
     @Log(title = "客户电子会员卡消费记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -128,7 +124,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 获取客户电子会员卡消费汇总金额
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:xfAmtQuery')")
     @GetMapping(value = "xfAmtQuery")
     public AjaxResult xfAmtQuery(CustomerCardRecordConsumption customerCardRecordConsumption)
     {
@@ -145,7 +140,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 获取客户电子会员卡消费汇总折线图x 轴数据
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:listXdata')")
     @GetMapping(value = "listXdata")
     public TableDataInfo listXdata(CustomerCardRecordConsumption customerCardRecordConsumption)
     {
@@ -163,7 +157,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 获取客户电子会员卡消费汇总折线图充值数据
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:listXFData')")
     @GetMapping(value = "/listXFData")
     public AjaxResult listXFData(CustomerCardRecordConsumption customerCardRecordConsumption)
     {
@@ -180,7 +173,6 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 获取客户电子会员卡消费汇总折线图充值数据
      */
-    @PreAuthorize("@ss.hasPermi('customer:consumption:listQydataXF')")
     @GetMapping(value = "/listQydataXF")
     public TableDataInfo listQydataXF(CustomerCardRecordConsumption customerCardRecordConsumption)
     {

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

@@ -48,13 +48,7 @@ public class CustomerCardSettingController extends BaseController
     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);
-        }
+        customerCardSetting.setStationId(currentUser.getUser().getDeptId());
         startPage();
         List<CustomerCardSetting> settingList = customerCardSettingService.selectCustomerCardSettingList(customerCardSetting);
         return getDataTable(settingList);
@@ -68,13 +62,8 @@ public class CustomerCardSettingController extends BaseController
     public AjaxResult export(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);
-        }
+
+        customerCardSetting.setStationId(currentUser.getUser().getDeptId());
         List<CustomerCardSetting> settingList = customerCardSettingService.selectCustomerCardSettingList(customerCardSetting);
         ExcelUtil<CustomerCardSetting> util = new ExcelUtil<CustomerCardSetting>(CustomerCardSetting.class);
         return util.exportExcel(settingList, "setting");
@@ -94,11 +83,17 @@ public class CustomerCardSettingController extends BaseController
      */
     @Log(title = "客户电子会员卡充值优惠设置", businessType = BusinessType.INSERT)
     @PostMapping
+    @Transactional
     public AjaxResult add(@RequestBody CustomerCardSetting customerCardSetting)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         customerCardSetting.setStationId(currentUser.getUser().getDeptId());
-        customerCardSetting.setStationName(currentUser.getUser().getDept().getDeptName());
+        if(customerCardSetting!=null &&customerCardSetting.getCardEnabledFlag()!=null && !customerCardSetting.getCardEnabledFlag().equals("")){
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            dept.setIntegralFlag(customerCardSetting.getCardEnabledFlag());
+            deptService.updateDept(dept);
+        }
         return toAjax(customerCardSettingService.insertCustomerCardSetting(customerCardSetting));
     }
 
@@ -107,12 +102,29 @@ public class CustomerCardSettingController extends BaseController
      */
     @Log(title = "客户电子会员卡充值优惠设置", businessType = BusinessType.UPDATE)
     @PutMapping
+    @Transactional
     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));
+        int i =0;
+        if(customerCardSetting!=null&&customerCardSetting.getCardEnabledFlag()!=null && !customerCardSetting.getCardEnabledFlag().equals("")){
+            if(customerCardSetting.getCardEnabledFlag().equals("1")){
+                SysDept dept =new SysDept();
+                dept.setDeptId(currentUser.getUser().getDeptId());
+                dept.setCardEnabledFlag(customerCardSetting.getCardEnabledFlag());
+                i= deptService.updateDept(dept);
+                if(i==1) {
+                    i = customerCardSettingService.updateCustomerCardSetting(customerCardSetting);
+                }
+            }else if(customerCardSetting.getCardEnabledFlag().equals("0")){
+                SysDept dept =new SysDept();
+                dept.setDeptId(currentUser.getUser().getDeptId());
+                dept.setCardEnabledFlag(customerCardSetting.getCardEnabledFlag());
+                i= deptService.updateDept(dept);
+            }
+        }
+        return toAjax(i);
     }
 
     /**
@@ -135,14 +147,28 @@ public class CustomerCardSettingController extends BaseController
     public AjaxResult selectCustomerCardSetting(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);
-        }
+        customerCardSetting.setStationId(currentUser.getUser().getDeptId());
         return AjaxResult.success(customerCardSettingService.selectCustomerCardSetting(customerCardSetting));
     }
 
+    /**
+     * 查询电子卡是否启用
+     */
+    @GetMapping(value = "/selectCardOpen")
+    public AjaxResult selectCardOpen(CustomerCardSetting customerCardSetting)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        //查询电子卡是否开启
+        SysDept dept  = deptService.selectDeptById(currentUser.getUser().getDeptId());
+        CustomerCardSetting cardSetting =new  CustomerCardSetting();
+        if(dept!=null &&dept.getCardEnabledFlag()!=null&& dept.getCardEnabledFlag().equals("1")){
+            //查询开启的电子卡
+            CustomerCardSetting setting =new CustomerCardSetting();
+            setting.setStationId(dept.getDeptId());
+            cardSetting=  customerCardSettingService.selectCustomerCardSetting(setting);
+        }else{
+            cardSetting.setCardOilsType("");
+        }
+        return AjaxResult.success(cardSetting);
+    }
 }

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

@@ -67,13 +67,16 @@ public class CustomerCardSettingDetailController extends BaseController
     {
         startPage();
         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);
-        }
+//        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);
+//        }
+
+        customerCardSetting.setStationId(currentUser.getUser().getDeptId());
+        customerCardSetting.setDelFlag("0");
         List<CustomerCardSettingDetail> detailList = customerCardSettingDetailService.listDetailInfo(customerCardSetting);
         return getDataTable(detailList);
     }

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

@@ -43,7 +43,6 @@ public class CustomerCardUseRecordController extends BaseController
     /**
      * 查询客户电子会员卡充值消费记录列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerCardUseRecord customerCardUseRecord)
     {
@@ -64,7 +63,6 @@ public class CustomerCardUseRecordController extends BaseController
     /**
      * 导出客户电子会员卡充值消费记录列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:record:export')")
     @Log(title = "客户电子会员卡充值消费记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerCardUseRecord customerCardUseRecord)
@@ -85,7 +83,6 @@ public class CustomerCardUseRecordController extends BaseController
     /**
      * 获取客户电子会员卡充值消费记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:record:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -106,7 +103,6 @@ public class CustomerCardUseRecordController extends BaseController
     /**
      * 修改客户电子会员卡充值消费记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:record:edit')")
     @Log(title = "客户电子会员卡充值消费记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerCardUseRecord customerCardUseRecord)
@@ -117,7 +113,6 @@ public class CustomerCardUseRecordController extends BaseController
     /**
      * 删除客户电子会员卡充值消费记录
      */
-    @PreAuthorize("@ss.hasPermi('customer:record:remove')")
     @Log(title = "客户电子会员卡充值消费记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -5,6 +5,7 @@ import com.yijia.common.constant.HttpStatus;
 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.common.utils.StringUtils;
 import com.yijia.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -140,6 +141,7 @@ public class CustomerElectronicCardController extends BaseController
         if(list!=null && list.size()>0){
             customerElectronicCard.setStationIdList(list);
             customerElectronicCard.setStationId(null);
+            customerElectronicCard.setStrSql(StringUtils.join(list, ","));
         }
        // startPage();
         List<CustomerElectronicCard>  querylist= customerElectronicCardService.selectCard(customerElectronicCard) ;

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

@@ -43,7 +43,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 查询客户优惠等级设置列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerGradeSetting customerGradeSetting)
     {
@@ -64,7 +63,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 导出客户优惠等级设置列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:export')")
     @Log(title = "客户优惠等级设置", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(CustomerGradeSetting customerGradeSetting)
@@ -86,7 +84,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 获取客户优惠等级设置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -96,7 +93,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 新增客户优惠等级设置
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:add')")
     @Log(title = "客户优惠等级设置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CustomerGradeSetting customerGradeSetting)
@@ -112,7 +108,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 修改客户优惠等级设置
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:edit')")
     @Log(title = "客户优惠等级设置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CustomerGradeSetting customerGradeSetting)
@@ -125,7 +120,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 删除客户优惠等级设置
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:remove')")
     @Log(title = "客户优惠等级设置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long ids)
@@ -146,7 +140,6 @@ public class CustomerGradeSettingController extends BaseController
     /**
      * 查询等级名称
      */
-    @PreAuthorize("@ss.hasPermi('customer:setting:gradeList')")
     @GetMapping("/gradeList")
     public TableDataInfo gradeList(CustomerGradeSetting customerGradeSetting)
     {

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

@@ -45,13 +45,33 @@ public class CustomerCardSetting extends BaseEntity
     private String enjoyIntegralMultiple;
 
     /** 油站ID */
-    @Excel(name = "油站ID")
     private Long stationId;
 
+    private String StationName;
+
     private String isGradeSetting;
 
     private String isMarket;
 
+    private String delFlag;
+    private String cardEnabledFlag;
+
+    public String getCardEnabledFlag() {
+        return cardEnabledFlag;
+    }
+
+    public void setCardEnabledFlag(String cardEnabledFlag) {
+        this.cardEnabledFlag = cardEnabledFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
     public String getIsGradeSetting() {
         return isGradeSetting;
     }
@@ -158,14 +178,13 @@ public class CustomerCardSetting extends BaseEntity
     {
         return stationId;
     }
-    public void setStationName(String stationName)
-    {
-        this.stationName = stationName;
+
+    public String getStationName() {
+        return StationName;
     }
 
-    public String getStationName()
-    {
-        return stationName;
+    public void setStationName(String stationName) {
+        StationName = stationName;
     }
 
     @Override
@@ -180,7 +199,6 @@ public class CustomerCardSetting extends BaseEntity
             .append("isDiscountCoupon", getIsDiscountCoupon())
             .append("enjoyIntegralMultiple", getEnjoyIntegralMultiple())
             .append("stationId", getStationId())
-            .append("stationName", getStationName())
             .append("createTime", getCreateTime())
             .toString();
     }

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

@@ -38,6 +38,15 @@ public class CustomerCardSettingDetail extends BaseEntity
     private String isMarket;
     private String presentScale;
     private String enjoyIntegralMultiple;
+    private String delFlag;
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
 
     public String getCardType() {
         return cardType;

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

@@ -12,7 +12,7 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 客户管理对象 customer_manage
- * 
+ *
  * @author yijia
  * @date 2021-01-22
  */
@@ -134,6 +134,34 @@ public class CustomerManage extends BaseEntity
 
     private Date payDate;
 
+    private String fyAmt;
+    private String lngAmt;
+    private String cngAmt;
+
+    public String getFyAmt() {
+        return fyAmt;
+    }
+
+    public void setFyAmt(String fyAmt) {
+        this.fyAmt = fyAmt;
+    }
+
+    public String getLngAmt() {
+        return lngAmt;
+    }
+
+    public void setLngAmt(String lngAmt) {
+        this.lngAmt = lngAmt;
+    }
+
+    public String getCngAmt() {
+        return cngAmt;
+    }
+
+    public void setCngAmt(String cngAmt) {
+        this.cngAmt = cngAmt;
+    }
+
     public Date getPayDate() {
         return payDate;
     }
@@ -160,250 +188,250 @@ public class CustomerManage extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setMemberId(String memberId) 
+    public void setMemberId(String memberId)
     {
         this.memberId = memberId;
     }
 
-    public String getMemberId() 
+    public String getMemberId()
     {
         return memberId;
     }
-    public void setCustomerName(String customerName) 
+    public void setCustomerName(String customerName)
     {
         this.customerName = customerName;
     }
 
-    public String getCustomerName() 
+    public String getCustomerName()
     {
         return customerName;
     }
-    public void setCommendMan(String commendMan) 
+    public void setCommendMan(String commendMan)
     {
         this.commendMan = commendMan;
     }
 
-    public String getCommendMan() 
+    public String getCommendMan()
     {
         return commendMan;
     }
-    public void setMemberGrade(String memberGrade) 
+    public void setMemberGrade(String memberGrade)
     {
         this.memberGrade = memberGrade;
     }
 
-    public String getMemberGrade() 
+    public String getMemberGrade()
     {
         return memberGrade;
     }
-    public void setPhoneNumber(String phoneNumber) 
+    public void setPhoneNumber(String phoneNumber)
     {
         this.phoneNumber = phoneNumber;
     }
 
-    public String getPhoneNumber() 
+    public String getPhoneNumber()
     {
         return phoneNumber;
     }
-    public void setCarNumber(String carNumber) 
+    public void setCarNumber(String carNumber)
     {
         this.carNumber = carNumber;
     }
 
-    public String getCarNumber() 
+    public String getCarNumber()
     {
         return carNumber;
     }
-    public void setBalance(BigDecimal balance) 
+    public void setBalance(BigDecimal balance)
     {
         this.balance = balance;
     }
 
-    public BigDecimal getBalance() 
+    public BigDecimal getBalance()
     {
         return balance;
     }
-    public void setIntegral(Long integral) 
+    public void setIntegral(Long integral)
     {
         this.integral = integral;
     }
 
-    public Long getIntegral() 
+    public Long getIntegral()
     {
         return integral;
     }
-    public void setSpecialCarType(String specialCarType) 
+    public void setSpecialCarType(String specialCarType)
     {
         this.specialCarType = specialCarType;
     }
 
-    public String getSpecialCarType() 
+    public String getSpecialCarType()
     {
         return specialCarType;
     }
-    public void setRegtime(Date regtime) 
+    public void setRegtime(Date regtime)
     {
         this.regtime = regtime;
     }
 
-    public Date getRegtime() 
+    public Date getRegtime()
     {
         return regtime;
     }
-    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 setCyGrade(String cyGrade) 
+    public void setCyGrade(String cyGrade)
     {
         this.cyGrade = cyGrade;
     }
 
-    public String getCyGrade() 
+    public String getCyGrade()
     {
         return cyGrade;
     }
-    public void setQyGrade(String qyGrade) 
+    public void setQyGrade(String qyGrade)
     {
         this.qyGrade = qyGrade;
     }
 
-    public String getQyGrade() 
+    public String getQyGrade()
     {
         return qyGrade;
     }
-    public void setCyLiters(BigDecimal cyLiters) 
+    public void setCyLiters(BigDecimal cyLiters)
     {
         this.cyLiters = cyLiters;
     }
 
-    public BigDecimal getCyLiters() 
+    public BigDecimal getCyLiters()
     {
         return cyLiters;
     }
-    public void setQyLiters(BigDecimal qyLiters) 
+    public void setQyLiters(BigDecimal qyLiters)
     {
         this.qyLiters = qyLiters;
     }
 
-    public BigDecimal getQyLiters() 
+    public BigDecimal getQyLiters()
     {
         return qyLiters;
     }
-    public void setCyAmt(BigDecimal cyAmt) 
+    public void setCyAmt(BigDecimal cyAmt)
     {
         this.cyAmt = cyAmt;
     }
 
-    public BigDecimal getCyAmt() 
+    public BigDecimal getCyAmt()
     {
         return cyAmt;
     }
-    public void setQyAmt(BigDecimal qyAmt) 
+    public void setQyAmt(BigDecimal qyAmt)
     {
         this.qyAmt = qyAmt;
     }
 
-    public BigDecimal getQyAmt() 
+    public BigDecimal getQyAmt()
     {
         return qyAmt;
     }
-    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 setBlogUserId(Long blogUserId) 
+    public void setBlogUserId(Long blogUserId)
     {
         this.blogUserId = blogUserId;
     }
 
-    public Long getBlogUserId() 
+    public Long getBlogUserId()
     {
         return blogUserId;
     }
-    public void setMinaUserId(Long minaUserId) 
+    public void setMinaUserId(Long minaUserId)
     {
         this.minaUserId = minaUserId;
     }
 
-    public Long getMinaUserId() 
+    public Long getMinaUserId()
     {
         return minaUserId;
     }
-    public void setOilName(String oilName) 
+    public void setOilName(String oilName)
     {
         this.oilName = oilName;
     }
 
-    public String getOilName() 
+    public String getOilName()
     {
         return oilName;
     }
-    public void setGrade(String grade) 
+    public void setGrade(String grade)
     {
         this.grade = grade;
     }
 
-    public String getGrade() 
+    public String getGrade()
     {
         return grade;
     }
-    public void setLiters(BigDecimal liters) 
+    public void setLiters(BigDecimal liters)
     {
         this.liters = liters;
     }
 
-    public BigDecimal getLiters() 
+    public BigDecimal getLiters()
     {
         return liters;
     }
-    public void setAmt(BigDecimal amt) 
+    public void setAmt(BigDecimal amt)
     {
         this.amt = amt;
     }
 
-    public BigDecimal getAmt() 
+    public BigDecimal getAmt()
     {
         return amt;
     }
-    public void setUnionId(String unionId) 
+    public void setUnionId(String unionId)
     {
         this.unionId = unionId;
     }
 
-    public String getUnionId() 
+    public String getUnionId()
     {
         return unionId;
     }

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

@@ -64,4 +64,12 @@ public interface CustomerCardSettingDetailMapper
     public void deleteCustomerCardSettingDetail(CustomerCardSettingDetail detil);
 
     public List<CustomerCardSettingDetail> listDetailInfo(CustomerCardSetting customerCardSetting);
+
+    /**
+     * 修改客户电子会员卡充值优惠设置明细 删除标识
+     *
+     * @param detil 客户电子会员卡充值优惠设置明细  删除标识
+     * @return 结果
+     */
+    public  int updateDetail(CustomerCardSettingDetail detil);
 }

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

@@ -64,5 +64,4 @@ public interface ICustomerCardSettingService
      * @return 结果
      */
     public int deleteCustomerCardSettingById(Long id);
-
 }

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

@@ -1,10 +1,14 @@
 package com.yijia.customer.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.DateUtils;
+import com.yijia.common.utils.SecurityUtils;
 import com.yijia.customer.domain.CustomerCardSettingDetail;
 import com.yijia.customer.mapper.CustomerCardSettingDetailMapper;
-import com.yijia.customer.service.ICustomerCardSettingDetailService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yijia.customer.mapper.CustomerCardSettingMapper;
@@ -62,6 +66,7 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
         if(setting!=null){
             CustomerCardSettingDetail detail = new CustomerCardSettingDetail();
             detail.setParentId(setting.getId());
+            detail.setDelFlag("0");
             List<CustomerCardSettingDetail> detailList =customerCardSettingDetailMapper.selectCustomerCardSettingDetailList(detail);
             if(detailList==null ){
                 CustomerCardSettingDetail cardSettingDetail = new CustomerCardSettingDetail();
@@ -71,11 +76,15 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
         }else{
             setting =new  CustomerCardSetting();
             setting.setIsGradeSetting("1");
+            setting.setCardEnabledFlag("0");
             setting.setIsDiscountCoupon("1");
             setting.setIsMarket("1");
             setting.setEnjoyIntegralMultiple("1");
             setting.setPresentScale("0");
-            setting.setDiscountTimeSetting("1");
+            setting.setDiscountTimeSetting("0");
+            setting.setDiscountTime("");
+            List<CustomerCardSettingDetail> detailList =new ArrayList<>();
+            setting.setDetailList(detailList);
         }
         return setting;
     }
@@ -89,12 +98,17 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
     @Override
     public int insertCustomerCardSetting(CustomerCardSetting customerCardSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
         customerCardSetting.setCreateTime(DateUtils.getNowDate());
+        customerCardSetting.setCreateBy(currentUser.getUser().getUserId()+"");
         int i =customerCardSettingMapper.insertCustomerCardSetting(customerCardSetting);
         if(customerCardSetting.getDetailList()!=null && customerCardSetting.getDetailList().size()>0){
             List<CustomerCardSettingDetail> list = customerCardSetting.getDetailList();
             for(CustomerCardSettingDetail detil:list){
+                detil.setDelFlag("0");
                 detil.setParentId(customerCardSetting.getId());
+                detil.setCreateBy(String.valueOf(currentUser.getUser().getUserId()));
+                detil.setCreateTime(DateUtils.getNowDate());
                 customerCardSettingDetailMapper.insertCustomerCardSettingDetail(detil);
             }
         }
@@ -110,14 +124,20 @@ public class CustomerCardSettingServiceImpl implements ICustomerCardSettingServi
     @Override
     public int updateCustomerCardSetting(CustomerCardSetting customerCardSetting)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
         int i  =customerCardSettingMapper.updateCustomerCardSetting(customerCardSetting);
         CustomerCardSettingDetail detil = new CustomerCardSettingDetail();
         detil.setParentId(customerCardSetting.getId());
-        customerCardSettingDetailMapper.deleteCustomerCardSettingDetail(detil);
+        detil.setDelFlag("1");
+        customerCardSettingDetailMapper.updateDetail(detil);
         if(customerCardSetting.getDetailList()!=null && customerCardSetting.getDetailList().size()>0){
             List<CustomerCardSettingDetail> list = customerCardSetting.getDetailList();
             for(CustomerCardSettingDetail settingDetil:list){
+                settingDetil.setDelFlag("0");
+                settingDetil.setId(null);
                 settingDetil.setParentId(customerCardSetting.getId());
+                settingDetil.setCreateTime(DateUtils.getNowDate());
+                settingDetil.setCreateBy(currentUser.getUser().getUserId()+"");
                 customerCardSettingDetailMapper.insertCustomerCardSettingDetail(settingDetil);
             }
         }

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

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="discountAmtStart"    column="discount_amt_start"    />
         <result property="discountAmtEnd"    column="discount_amt_end"    />
         <result property="presentAmt"    column="present_amt"    />
-        <result property="cardType"    column="car_type"    />
+        <result property="cardType"    column="card_type"    />
         <result property="status"    column="status"    />
         <result property="cardOilsType"    column="card_oils_type"    />
         <result property="discountTimeSetting"    column="discount_time_setting"    />
@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isMarket"    column="is_market"/>
         <result property="presentScale"    column="present_scale"/>
         <result property="enjoyIntegralMultiple"    column="enjoy_integral_multiple"/>
-
+        <result property="delFlag"    column="del_flag"/>
     </resultMap>
 
     <sql id="selectCustomerCardSettingDetailVo">
-        select id, parent_id, setting_rule_type, discount_amt_start,discount_amt_end, present_amt,car_type,status from customer_card_setting_detail
+        select id, parent_id, setting_rule_type, discount_amt_start,discount_amt_end, present_amt,card_type,status,del_flag
+         from customer_card_setting_detail
     </sql>
 
     <select id="selectCustomerCardSettingDetailList" parameterType="CustomerCardSettingDetail" resultMap="CustomerCardSettingDetailResult">
@@ -36,8 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="cardType != null "> and car_type = #{cardType}</if>
+            <if test="cardType != null "> and card_type = #{cardType}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listDetailInfo" parameterType="CustomerCardSetting" resultMap="CustomerCardSettingDetailResult">
-        SELECT a.setting_rule_type,a.discount_amt_start,a.discount_amt_end,a.present_amt,car_type,b.card_oils_type,
+        SELECT a.setting_rule_type,a.discount_amt_start,a.discount_amt_end,a.present_amt,card_type,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>
@@ -58,8 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--            <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="cardType != null "> and car_type = #{cardType}</if>-->
+<!--            <if test="cardType != null "> and card_type = #{cardType}</if>-->
 <!--            <if test="status != null "> and status = #{status}</if>-->
+            <if test="delFlag != null "> and a.del_flag = #{delFlag}</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -84,8 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null">discount_amt_start,</if>
             <if test="discountAmtEnd != null">discount_amt_end,</if>
             <if test="presentAmt != null">present_amt,</if>
-            <if test="cardType != null">car_type,</if>
+            <if test="cardType != null">card_type,</if>
             <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="presentAmt != null">#{presentAmt},</if>
             <if test="cardType != null">#{cardType},</if>
             <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
          </trim>
     </insert>
 
@@ -107,12 +112,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="discountAmtStart != null">discount_amt_start = #{discountAmtStart},</if>
             <if test="discountAmtEnd != null">discount_amt_end = #{discountAmtEnd},</if>
             <if test="presentAmt != null">present_amt = #{presentAmt},</if>
-            <if test="cardType != null">car_type = #{cardType},</if>
+            <if test="cardType != null">card_type = #{cardType},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>
         where id = #{id}
     </update>
 
+    <update id="updateDetail" parameterType="CustomerCardSettingDetail">
+        update customer_card_setting_detail set del_flag = #{delFlag}
+        where parent_id = #{parentId}
+    </update>
+
     <delete id="deleteCustomerCardSettingDetailById" parameterType="Long">
         delete from customer_card_setting_detail where id = #{id}
     </delete>
@@ -131,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="cardType != null"> and car_type = #{cardType}</if>
+            <if test="cardType != null"> and card_type = #{cardType}</if>
             <if test="status != null"> and status = #{status}</if>
         </where>
     </delete>

yijia-customer/src/main/resources/mapper/customer/CustomerCardSettingMapper.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.CustomerCardSettingMapper">
-    
+
     <resultMap type="CustomerCardSetting" id="CustomerCardSettingResult">
         <result property="id"    column="id"    />
         <result property="cardOilsType"    column="card_oils_type"    />
@@ -16,17 +16,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
         <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
         <result property="isGradeSetting"    column="is_grade_setting"    />
         <result property="isMarket"    column="is_market"    />
+        <result property="cardEnabledFlag"    column="card_enabled_flag"    />
     </resultMap>
 
     <sql id="selectCustomerCardSettingVo">
-        select id, card_oils_type, discount_time_setting, discount_time, present_scale, is_discount_coupon, enjoy_integral_multiple, station_id, station_name, create_time,discount_time_type,is_market,is_grade_setting from customer_card_setting
+        select id, card_oils_type, discount_time_setting, discount_time, present_scale, is_discount_coupon, enjoy_integral_multiple,
+        station_id, d.dept_name as station_name, c.create_time,discount_time_type,is_market,is_grade_setting,card_enabled_flag
+        from customer_card_setting c join sys_dept d on c.station_id = d.dept_id
     </sql>
 
     <select id="selectCustomerCardSettingList" parameterType="CustomerCardSetting" resultMap="CustomerCardSettingResult">
         <include refid="selectCustomerCardSettingVo"/>
-        <where>  
+        <where>
             <if test="cardOilsType != null  and cardOilsType != ''"> and card_oils_type = #{cardOilsType}</if>
             <if test="discountTimeSetting != null  and discountTimeSetting != ''"> and discount_time_setting = #{discountTimeSetting}</if>
             <if test="discountTime != null  and discountTime != ''"> and discount_time = #{discountTime}</if>
@@ -37,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isGradeSetting != null   and isGradeSetting != ''"> and is_grade_setting = #{isGradeSetting}</if>
             <if test="isMarket != null   and isMarket != ''"> and is_market = #{isMarket}</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="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -61,7 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="isGradeSetting != null   and isGradeSetting != ''"> and is_grade_setting = #{isGradeSetting}</if>
             <if test="isMarket != null   and isMarket != ''"> and is_market = #{isMarket}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -76,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCustomerCardSettingVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertCustomerCardSetting" parameterType="CustomerCardSetting" useGeneratedKeys="true" keyProperty="id">
         insert into customer_card_setting
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,8 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDiscountCoupon != null">is_discount_coupon,</if>
             <if test="enjoyIntegralMultiple != null">enjoy_integral_multiple,</if>
             <if test="stationId != null">station_id,</if>
-            <if test="stationName != null">station_name,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
             <if test="isGradeSetting != null">is_grade_setting,</if>
             <if test="isMarket != null">is_market,</if>
          </trim>
@@ -104,8 +110,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDiscountCoupon != null">#{isDiscountCoupon},</if>
             <if test="enjoyIntegralMultiple != null">#{enjoyIntegralMultiple},</if>
             <if test="stationId != null">#{stationId},</if>
-            <if test="stationName != null">#{stationName},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
             <if test="isGradeSetting != null">#{isGradeSetting},</if>
             <if test="isMarket != null">#{isMarket},</if>
          </trim>
@@ -122,8 +130,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDiscountCoupon != null">is_discount_coupon = #{isDiscountCoupon},</if>
             <if test="enjoyIntegralMultiple != null">enjoy_integral_multiple = #{enjoyIntegralMultiple},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
-            <if test="stationName != null">station_name = #{stationName},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="isMarket != null">is_market = #{isMarket},</if>
             <if test="isGradeSetting != null">is_grade_setting = #{isGradeSetting},</if>
         </trim>
@@ -135,10 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCustomerCardSettingByIds" parameterType="String">
-        delete from customer_card_setting where id in 
+        delete from customer_card_setting where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

yijia-customer/src/main/resources/mapper/customer/CustomerManageMapper.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.CustomerManageMapper">
-    
+
     <resultMap type="CustomerManage" id="CustomerManageResult">
         <result property="id"    column="id"    />
         <result property="memberId"    column="member_id"    />
@@ -34,6 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="amt"    column="amt"    />
         <result property="unionId"    column="union_id"    />
         <result property="payDate"    column="pay_date"    />
+        <result property="fyAmt"    column="fy_amt"    />
+        <result property="lngAmt"    column="lng_amt"    />
+        <result property="cngAmt"    column="cng_amt"    />
     </resultMap>
 
     <sql id="selectCustomerManageVo">
@@ -42,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCustomerManageList" parameterType="CustomerManage" resultMap="CustomerManageResult">
         <include refid="selectCustomerManageVo"/>
-        <where>  
+        <where>
             <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="commendMan != null  and commendMan != ''"> and commend_man = #{commendMan}</if>
@@ -80,12 +83,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by  id desc
     </select>
-    
+
     <select id="selectCustomerManageById" parameterType="Long" resultMap="CustomerManageResult">
         <include refid="selectCustomerManageVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertCustomerManage" parameterType="CustomerManage" useGeneratedKeys="true" keyProperty="id">
         insert into customer_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCustomerManageByIds" parameterType="String">
-        delete from customer_manage where id in 
+        delete from customer_manage where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -216,8 +219,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCustomerManage" parameterType="CustomerManage" resultMap="CustomerManageResult">
         SELECT sy.*,px.pay_date from (
         SELECT m.member_id,m.customer_name,m.phone_number,m.car_number,GROUP_CONCAT(DISTINCT(m.oil_name)) oil_name,
-        GROUP_CONCAT(DISTINCT(m.grade)) as grade,m.union_id,p.points as integral,sum(CASE c.card_oils_type  WHEN '1' THEN  c.amt ELSE 0 END ) qy_amt,
-        sum(CASE c.card_oils_type  WHEN '2' THEN  c.amt ELSE 0 END ) cy_amt,m.mina_user_id
+        GROUP_CONCAT(DISTINCT(m.grade)) as grade,m.union_id,p.points as integral,
+        sum(CASE c.card_oils_type  WHEN '1' THEN  c.amt ELSE 0 END ) qy_amt,
+        sum(CASE c.card_oils_type  WHEN '2' THEN  c.amt ELSE 0 END ) cy_amt,
+        sum(CASE c.card_oils_type  WHEN '3' THEN  c.amt ELSE 0 END ) fy_amt,
+        sum(CASE c.card_oils_type  WHEN '4' THEN  c.amt ELSE 0 END ) lng_amt,
+        sum(CASE c.card_oils_type  WHEN '5' THEN  c.amt ELSE 0 END ) cng_amt,
+        m.mina_user_id
             from customer_manage m
             left join customer_points p on m.union_id = p.union_id and m.station_id = p.station_id
             left join customer_electronic_card c on c.union_id =m.union_id and c.station_id = m.station_id
@@ -251,4 +259,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY  po.consumer) px on sy.customer_name =  px.consumer
         order by px.pay_date desc
     </select>
-</mapper>
+</mapper>