增加电子卡

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

@@ -157,8 +157,25 @@ public class CustomerCardRecordConsumptionController extends BaseController
     /**
      * 获取客户电子会员卡消费汇总折线图充值数据
      */
+    @PreAuthorize("@ss.hasPermi('customer:consumption:listXFData')")
+    @GetMapping(value = "/listXFData")
+    public AjaxResult listXFData(CustomerCardRecordConsumption customerCardRecordConsumption)
+    {
+        if(customerCardRecordConsumption!=null &&customerCardRecordConsumption.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(Long.valueOf(customerCardRecordConsumption.getStationId()));
+            List<String> list = deptService.selectDeptId(dept);
+            customerCardRecordConsumption.setStationIdList(list);
+            customerCardRecordConsumption.setStationId(null);
+        }
+        customerCardRecordConsumption.setStatus("1");
+        return AjaxResult.success(customerCardRecordConsumptionService.listXFData(customerCardRecordConsumption));
+    }
+    /**
+     * 获取客户电子会员卡消费汇总折线图充值数据
+     */
     @PreAuthorize("@ss.hasPermi('customer:consumption:listQydataXF')")
-    @GetMapping(value = "listQydataXF")
+    @GetMapping(value = "/listQydataXF")
     public TableDataInfo listQydataXF(CustomerCardRecordConsumption customerCardRecordConsumption)
     {
         if(customerCardRecordConsumption!=null &&customerCardRecordConsumption.getStationId()!=null){

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/controller/CustomerCardRecordRechargeController.java

@@ -177,4 +177,19 @@ public class CustomerCardRecordRechargeController extends BaseController
         rspData.setTotal(pagelist.size());
         return rspData;
     }
+
+    @PreAuthorize("@ss.hasPermi('customer:recharge:listCZData')")
+    @GetMapping(value = "/listCZData")
+    public AjaxResult listCZData(CustomerCardRecordRecharge customerCardRecordRecharge)
+    {
+        if(customerCardRecordRecharge!=null &&customerCardRecordRecharge.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(Long.valueOf(customerCardRecordRecharge.getStationId()));
+            List<String> list = deptService.selectDeptId(dept);
+            customerCardRecordRecharge.setStationIdList(list);
+            customerCardRecordRecharge.setStationId(null);
+        }
+        customerCardRecordRecharge.setStatus("1");
+        return AjaxResult.success(customerCardRecordRechargeService.listCZData(customerCardRecordRecharge));
+    }
 }

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

@@ -159,5 +159,37 @@ public class CustomerElectronicCardController extends BaseController
         rspData.setTotal(pagelist.size());
         return rspData;
     }
+    /**
+     * 查询电子会员数据
+     */
+    @PreAuthorize("@ss.hasPermi('customer:card:listHYData')")
+    @GetMapping("/listHYData")
+    public AjaxResult listHYData(CustomerElectronicCard customerElectronicCard)
+    {
+        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
+            List<String> list = deptService.selectDeptId(dept);
+            customerElectronicCard.setStationIdList(list);
+            customerElectronicCard.setStationId(null);
+        }
+        return AjaxResult.success(customerElectronicCardService.listHYData(customerElectronicCard));
+    }
 
+    /**
+     * 查询电子会员数据
+     */
+    @PreAuthorize("@ss.hasPermi('customer:card:listJRHYData')")
+    @GetMapping("/listJRHYData")
+    public AjaxResult listJRHYData(CustomerElectronicCard customerElectronicCard)
+    {
+        if(customerElectronicCard!=null &&customerElectronicCard.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(Long.valueOf(customerElectronicCard.getStationId()));
+            List<String> list = deptService.selectDeptId(dept);
+            customerElectronicCard.setStationIdList(list);
+            customerElectronicCard.setStationId(null);
+        }
+        return AjaxResult.success(customerElectronicCardService.listJRHYData(customerElectronicCard));
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.yijia.customer.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.yijia.common.annotation.Excel;
@@ -64,8 +67,17 @@ public class CustomerCardRecordConsumption extends BaseEntity
     private String stationName;
 
     /** 是否消费成功：0，未成功；1，成功 */
-    @Excel(name = "是否消费成功：0，未成功；1，成功")
     private String status;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date payDate;
+
+    public Date getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(Date payDate) {
+        this.payDate = payDate;
+    }
 
     public BigDecimal getBalance() {
         return balance;

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

@@ -36,6 +36,24 @@ public class CustomerCardSettingDetail extends BaseEntity
     private String isDiscountCoupon;
     private String isGradeSetting;
     private String isMarket;
+    private String presentScale;
+    private String enjoyIntegralMultiple;
+
+    public String getEnjoyIntegralMultiple() {
+        return enjoyIntegralMultiple;
+    }
+
+    public void setEnjoyIntegralMultiple(String enjoyIntegralMultiple) {
+        this.enjoyIntegralMultiple = enjoyIntegralMultiple;
+    }
+
+    public String getPresentScale() {
+        return presentScale;
+    }
+
+    public void setPresentScale(String presentScale) {
+        this.presentScale = presentScale;
+    }
 
     public String getCardOilsType() {
         return cardOilsType;

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/mapper/CustomerCardRecordConsumptionMapper.java

@@ -73,4 +73,6 @@ public interface CustomerCardRecordConsumptionMapper
      * 获取客户电子会员卡消费汇总折线图充值数据
      */
     public List<CustomerCardRecordConsumption> listQydataXF(CustomerCardRecordConsumption customerCardRecordConsumption);
+
+    public CustomerCardRecordConsumption listXFData(CustomerCardRecordConsumption customerCardRecordConsumption);
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/mapper/CustomerCardRecordRechargeMapper.java

@@ -75,4 +75,6 @@ public interface CustomerCardRecordRechargeMapper
      * 获取客户电子会员卡消费充值明细分页
      */
     public List<CustomerCardRecordRecharge> selectCardDetailPage(CustomerCardRecordRecharge customerCardRecordRecharge);
+
+    public CustomerCardRecordRecharge listCZData(CustomerCardRecordRecharge customerCardRecordRecharge);
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/mapper/CustomerElectronicCardMapper.java

@@ -70,4 +70,8 @@ public interface CustomerElectronicCardMapper
     public List<CustomerElectronicCard> selectCard(CustomerElectronicCard customerElectronicCard);
 
     public List<CustomerElectronicCard> selectCardPage(CustomerElectronicCard customerElectronicCard);
+
+    public CustomerElectronicCard listHYData(CustomerElectronicCard customerElectronicCard);
+
+    public CustomerElectronicCard listJRHYData(CustomerElectronicCard customerElectronicCard);
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/ICustomerCardRecordConsumptionService.java

@@ -72,4 +72,6 @@ public interface ICustomerCardRecordConsumptionService
      * 获取客户电子会员卡消费汇总折线图充值数据
      */
     public  List<CustomerCardRecordConsumption> listQydataXF(CustomerCardRecordConsumption customerCardRecordConsumption);
+
+    public CustomerCardRecordConsumption listXFData(CustomerCardRecordConsumption customerCardRecordConsumption);
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/ICustomerCardRecordRechargeService.java

@@ -76,4 +76,6 @@ public interface ICustomerCardRecordRechargeService
      * 获取客户电子会员卡消费充值明细分页
      */
     public List<CustomerCardRecordRecharge> selectCardDetailPage(CustomerCardRecordRecharge customerCardRecordRecharge);
+
+    public CustomerCardRecordRecharge listCZData(CustomerCardRecordRecharge customerCardRecordRecharge);
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/ICustomerElectronicCardService.java

@@ -69,4 +69,8 @@ public interface ICustomerElectronicCardService
     public List<CustomerElectronicCard> selectCard(CustomerElectronicCard customerElectronicCard);
 
     public List<CustomerElectronicCard> selectCardPage(CustomerElectronicCard customerElectronicCard);
+
+    public CustomerElectronicCard listHYData(CustomerElectronicCard customerElectronicCard);
+
+    public CustomerElectronicCard listJRHYData(CustomerElectronicCard customerElectronicCard);
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/impl/CustomerCardRecordConsumptionServiceImpl.java

@@ -110,4 +110,9 @@ public class CustomerCardRecordConsumptionServiceImpl implements ICustomerCardRe
         return customerCardRecordConsumptionMapper.listQydataXF(customerCardRecordConsumption);
     }
 
+    @Override
+    public CustomerCardRecordConsumption listXFData(CustomerCardRecordConsumption customerCardRecordConsumption) {
+        return customerCardRecordConsumptionMapper.listXFData(customerCardRecordConsumption);
+    }
+
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/impl/CustomerCardRecordRechargeServiceImpl.java

@@ -122,4 +122,9 @@ public class CustomerCardRecordRechargeServiceImpl implements ICustomerCardRecor
         return customerCardRecordRechargeMapper.selectCardDetailPage(customerCardRecordRecharge);
     }
 
+    @Override
+    public CustomerCardRecordRecharge listCZData(CustomerCardRecordRecharge customerCardRecordRecharge) {
+        return customerCardRecordRechargeMapper.listCZData(customerCardRecordRecharge);
+    }
+
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/impl/CustomerElectronicCardServiceImpl.java

@@ -114,4 +114,14 @@ public class CustomerElectronicCardServiceImpl implements ICustomerElectronicCar
         return customerElectronicCardMapper.selectCardPage(customerElectronicCard);
     }
 
+    @Override
+    public CustomerElectronicCard listHYData(CustomerElectronicCard customerElectronicCard) {
+        return customerElectronicCardMapper.listHYData( customerElectronicCard) ;
+    }
+
+    @Override
+    public CustomerElectronicCard listJRHYData(CustomerElectronicCard customerElectronicCard) {
+        return customerElectronicCardMapper.listJRHYData( customerElectronicCard) ;
+    }
+
 }

Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerCardRecordConsumptionMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cardOilsType"    column="card_oils_type"    />
         <result property="amt"    column="amt"    />
         <result property="createTime"    column="create_time"    />
+        <result property="payDate"    column="pay_date"    />
         <result property="balance"    column="balance"    />
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
@@ -22,38 +23,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCustomerCardRecordConsumptionVo">
-        select id, order_no, union_id, customer_no, customer_name, usage_type, pay_type, card_oils_type, amt, create_time, balance,station_id, station_name, status from customer_card_record_consumption
+        select id, order_no, union_id, customer_no, customer_name, usage_type, pay_type, card_oils_type, amt, create_time, balance,station_id, station_name, status
+        from customer_card_record_consumption a
     </sql>
 
     <select id="selectCustomerCardRecordConsumptionList" parameterType="CustomerCardRecordConsumption" resultMap="CustomerCardRecordConsumptionResult">
-        <include refid="selectCustomerCardRecordConsumptionVo"/>
+<!--       <include refid="selectCustomerCardRecordConsumptionVo"/>-->
+        select a.id, a.order_no, a.union_id, a.customer_no, a.customer_name, a.usage_type, a.pay_type, a.card_oils_type, a.amt, a.create_time, a.balance,a.station_id,
+         a.station_name, a.status,b.pay_date
+        from customer_card_record_consumption a join pay_order b on a.order_no=b.order_no
         <where>  
-            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
-            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
-            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="usageType != null  and usageType != ''"> and usage_type = #{usageType}</if>
-            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
-            <if test="cardOilsType != null  and cardOilsType != ''"> and card_oils_type = #{cardOilsType}</if>
-            <if test="amt != null "> and amt = #{amt}</if>
-            <if test="balance != null "> and balance = #{balance}</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="status != null  and status != ''"> and status = #{status}</if>
+            <if test="orderNo != null  and orderNo != ''"> and a.order_no = #{orderNo}</if>
+            <if test="unionId != null  and unionId != ''"> and a.union_id = #{unionId}</if>
+            <if test="customerNo != null  and customerNo != ''"> and a.customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and a.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="usageType != null  and usageType != ''"> and a.usage_type = #{usageType}</if>
+            <if test="payType != null  and payType != ''"> and a.pay_type = #{payType}</if>
+            <if test="cardOilsType != null  and cardOilsType != ''"> and a.card_oils_type = #{cardOilsType}</if>
+            <if test="amt != null "> and a.amt = #{amt}</if>
+            <if test="balance != null "> and a.balance = #{balance}</if>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and a.station_name like concat('%', #{stationName}, '%')</if>
+            <if test="status != null  and status != ''"> and a.status = #{status}</if>
             <if test="stationIdList != null ">
-                and station_id in
+                and a.station_id in
                 <foreach item="item" index="index" collection="stationIdList"
                          open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+                AND date_format(a.create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+                AND date_format(a.create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
+        order by id desc
     </select>
     
     <select id="selectCustomerCardRecordConsumptionById" parameterType="Long" resultMap="CustomerCardRecordConsumptionResult">
@@ -247,4 +253,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY  date_format(create_time,'%Y-%m-%d')
     </select>
+
+    <select id="listXFData" parameterType="CustomerCardRecordConsumption" resultMap="CustomerCardRecordConsumptionResult">
+        SELECT sum(amt) as amt from customer_card_record_consumption
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="usageType != null  and usageType != ''"> and usage_type = #{usageType}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="cardOilsType != null  and cardOilsType != ''"> and card_oils_type = #{cardOilsType}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="balance != null "> and balance = #{balance}</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="status != null  and status != ''"> and status = #{status}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+    </select>
 </mapper>

Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerCardRecordRechargeMapper.xml

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(create_time,'%Y-%m-%d %H:%i:%s') <= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
+        order by id desc
     </select>
     
     <select id="selectCustomerCardRecordRechargeById" parameterType="Long" resultMap="CustomerCardRecordRechargeResult">
@@ -195,6 +196,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY  date_format(create_time,'%Y-%m-%d')
     </select>
 
+    <select id="listCZData" parameterType="CustomerCardRecordRecharge" resultMap="CustomerCardRecordRechargeResult">
+        SELECT sum(amt) as amt
+        from customer_card_record_recharge
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="usageType != null  and usageType != ''"> and usage_type = #{usageType}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="cardOilsType != null  and cardOilsType != ''"> and card_oils_type = #{cardOilsType}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="presentAmt != null "> and present_amt = #{presentAmt}</if>
+            <if test="balance != null "> and balance = #{balance}</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="status != null  and status != ''"> and status = #{status}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+    </select>
     <!--存储过程-->
     <select id="selectCardDetail" parameterType="CustomerCardRecordRecharge" statementType="CALLABLE" resultMap="CustomerCardRecordRechargeResult">
          CALL selectCardDetail(#{strSql,mode=IN},#{createDate,mode=IN},#{pageSetting,mode=IN},#{pageNo,mode=IN})

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

@@ -19,6 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDiscountCoupon"    column="is_discount_coupon"    />
         <result property="isGradeSetting"    column="is_grade_setting"    />
         <result property="isMarket"    column="is_market"/>
+        <result property="presentScale"    column="present_scale"/>
+        <result property="enjoyIntegralMultiple"    column="enjoy_integral_multiple"/>
+
     </resultMap>
 
     <sql id="selectCustomerCardSettingDetailVo">
@@ -47,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="listDetailInfo" parameterType="CustomerCardSettingDetail" 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.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>

Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerElectronicCardMapper.xml

@@ -146,6 +146,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="listHYData" parameterType="CustomerElectronicCard" resultMap="CustomerElectronicCardResult">
+        SELECT  sum(amt) as amt,count(DISTINCT union_id ) as num
+        from customer_electronic_card
+        <where>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="blogOpenid != null  and blogOpenid != ''"> and blog_openid = #{blogOpenid}</if>
+            <if test="minaOpenid != null  and minaOpenid != ''"> and mina_openid = #{minaOpenid}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="mobilePhone != null  and mobilePhone != ''"> and mobile_phone = #{mobilePhone}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="cardOilsType != null  and cardOilsType != ''"> and card_oils_type = #{cardOilsType}</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="recentlyTime != null "> and recently_time = #{recentlyTime}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="listJRHYData" parameterType="CustomerElectronicCard" resultMap="CustomerElectronicCardResult">
+        SELECT count(DISTINCT union_id ) as num from customer_electronic_card
+        <where>
+            <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
+            <if test="blogOpenid != null  and blogOpenid != ''"> and blog_openid = #{blogOpenid}</if>
+            <if test="minaOpenid != null  and minaOpenid != ''"> and mina_openid = #{minaOpenid}</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no = #{customerNo}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="mobilePhone != null  and mobilePhone != ''"> and mobile_phone = #{mobilePhone}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="cardOilsType != null  and cardOilsType != ''"> and card_oils_type = #{cardOilsType}</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="recentlyTime != null "> and recently_time = #{recentlyTime}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+    </select>
      <!--存储过程
        CALL selectCard();
              CALL selectCard(#{pageNo,mode=IN},#{pageSetting,mode=IN});-->

Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerManageMapper.xml

@@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     <select id="selectCustomerManage" parameterType="CustomerManage" resultMap="CustomerManageResult">
-        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.member_grade)) as member_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
+        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
         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