储蓄卡使用记录接口

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -2,6 +2,7 @@ package com.platform.yijia.controller;
 
 import com.google.gson.Gson;
 import com.platform.yijia.param.request.PayInfoRequest;
+import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 import com.platform.yijia.service.ElectronicMembershipCardService;
 import com.platform.yijia.utils.CodeMsg;
@@ -66,7 +67,12 @@ public class ElectronicMembershipCardController {
         //返回结果集
         ResultData resultData = null;
         if(stationId !=null && unionId !=null){
-            resultData = ResultData.success("开发中...");
+            CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
+            customerCardUseRecord.setUsageType("+"); // '+' 代表充值
+            customerCardUseRecord.setStationId(stationId);
+            customerCardUseRecord.setUnionId(unionId);
+            List<CustomerCardUseRecord> cardUseRecordList = electronicMembershipCardService.getCardUseRecordList(customerCardUseRecord);
+            resultData = ResultData.success(cardUseRecordList);
         }else {
             resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
         }
@@ -81,7 +87,12 @@ public class ElectronicMembershipCardController {
         //返回结果集
         ResultData resultData = null;
         if(stationId !=null && unionId !=null){
-            resultData = ResultData.success("开发中...");
+            CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
+            customerCardUseRecord.setUnionId(unionId);
+            customerCardUseRecord.setStationId(stationId);
+            customerCardUseRecord.setUsageType("-"); // '-' 代表消费
+            List<CustomerCardUseRecord> cardUseRecordList = electronicMembershipCardService.getCardUseRecordList(customerCardUseRecord);
+            resultData = ResultData.success(cardUseRecordList);
         }else {
             resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
         }

YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -24,7 +24,7 @@ import java.util.*;
 
 /*
  * <Title> IntegralShoppingMallController </Title>
- * <Description> 油站积分商城控制层 </Description>
+ * <Description> 油站积分商城模块 </Description>
  * @Author JK
  * @Date 2021年2月24日
  */

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -27,7 +27,7 @@ import java.util.Map;
 
 /**
  * <Title> PosMachineController </Title>
- * <Description> POS机端控制层 </Description>
+ * <Description> POS机端模块功能 </Description>
  * @Author JK
  * @Date 2021年3月17日
  */

YijiaRestful/src/main/java/com/platform/yijia/dao/ElectronicMembershipCardMapper.java

@@ -1,6 +1,7 @@
 package com.platform.yijia.dao;
 
 
+import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 
 import java.util.List;
@@ -9,4 +10,7 @@ public interface ElectronicMembershipCardMapper {
 
     //获取用户储蓄卡列表
     List<CustomerElectronicCard> getElectronicCardList(CustomerElectronicCard customerElectronicCard);
+
+    //获取用户储蓄卡的使用记录
+    List<CustomerCardUseRecord> getCardUseRecordList(CustomerCardUseRecord customerCardUseRecord);
 }

YijiaRestful/src/main/java/com/platform/yijia/pojo/CustomerCardRecord.java → YijiaRestful/src/main/java/com/platform/yijia/pojo/CustomerCardUseRecord.java

@@ -6,16 +6,16 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 客户电子会员卡充值记录表
+ * 客户电子会员卡使用记录表
  */
 @Data
-public class CustomerCardRecord {
+public class CustomerCardUseRecord {
     private Integer id;
-    private String rechargeNo;      //'充值订单号',
-    private String union_id;        //'微信用户唯一标识',
+    private String orderNo;      //'充值订单号',
+    private String unionId;        //'微信用户唯一标识',
     private String customerName;    //''客户名'',
-    private String type;            //'电子会员卡消费充值类型：+，充值；-，消费；',
-    private String usage_type;      //'电子会员卡充值消费类型：1.微信；2.POS机',
+    private String usageType;            //'电子会员卡消费充值类型：+，充值；-，消费；',
+    private String type;      //'电子会员卡充值消费类型：1.微信；2.POS机',
     private String oilsType;        //油类：1.柴油；2.汽油；
     private BigDecimal amt;         //'充值，消费金额'
     private BigDecimal presentAmt;     //''赠送金额''

YijiaRestful/src/main/java/com/platform/yijia/service/ElectronicMembershipCardService.java

@@ -1,6 +1,7 @@
 package com.platform.yijia.service;
 
 
+import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 
 import java.util.List;
@@ -9,4 +10,7 @@ public interface ElectronicMembershipCardService {
     //获取用户储蓄卡列表
     List<CustomerElectronicCard> getElectronicCardList(CustomerElectronicCard customerElectronicCard);
 
+    //获取用户储蓄卡的使用记录
+    List<CustomerCardUseRecord> getCardUseRecordList(CustomerCardUseRecord customerCardUseRecord);
+
 }

YijiaRestful/src/main/java/com/platform/yijia/service/impl/ElectronicMembershipCardServiceImpl.java

@@ -2,6 +2,7 @@ package com.platform.yijia.service.impl;
 
 import com.platform.yijia.dao.ElectronicMembershipCardMapper;
 import com.platform.yijia.dao.IntegralRuleMapper;
+import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 import com.platform.yijia.pojo.IntegralRule;
 import com.platform.yijia.service.ElectronicMembershipCardService;
@@ -16,6 +17,12 @@ public class ElectronicMembershipCardServiceImpl implements ElectronicMembership
     @Resource
     private ElectronicMembershipCardMapper electronicMembershipCardMapper;
 
+    //获取用户储蓄卡的使用记录
+    @Override
+    public List<CustomerCardUseRecord> getCardUseRecordList(CustomerCardUseRecord customerCardUseRecord) {
+        return electronicMembershipCardMapper.getCardUseRecordList(customerCardUseRecord);
+    }
+
     //获取用户储蓄卡列表
     @Override
     public List<CustomerElectronicCard> getElectronicCardList(CustomerElectronicCard customerElectronicCard) {

YijiaRestful/src/main/resources/mapper/ElectronicMembershipCardMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.yijia.dao.ElectronicMembershipCardMapper">
   <!--储蓄卡返回结果-->
-  <resultMap id="BaseResultMap" type="com.platform.yijia.pojo.CustomerElectronicCard">
-      <id column="id"                          jdbcType="INTEGER"   property="id" />
+  <resultMap id="CardBaseResultMap" type="com.platform.yijia.pojo.CustomerElectronicCard">
+      <id     column="id"                      jdbcType="INTEGER"   property="id" />
       <result column="union_id"                jdbcType="VARCHAR"   property="unionId" />
       <result column="blog_openid"             jdbcType="VARCHAR"   property="blogOpenid" />
       <result column="customer_no"             jdbcType="VARCHAR"   property="customerNo" />
@@ -16,8 +16,55 @@
       <result column="recently_time"           jdbcType="TIMESTAMP" property="recentlyTime" />
   </resultMap>
 
+    <!--储蓄卡使用记录返回结果-->
+    <resultMap id="CardRecordBaseResultMap" type="com.platform.yijia.pojo.CustomerCardUseRecord">
+        <id     column="id"                    jdbcType="INTEGER"   property="id" />
+        <result column="order_no"              jdbcType="VARCHAR"   property="orderNo" />
+        <result column="union_id"              jdbcType="VARCHAR"   property="unionId" />
+        <result column="customer_name"         jdbcType="VARCHAR"   property="customerName" />
+        <result column="usage_type"            jdbcType="VARCHAR"   property="usageType" />
+        <result column="type"                  jdbcType="VARCHAR"   property="type" />
+        <result column="oils_type"             jdbcType="VARCHAR"   property="oilsType" />
+        <result column="amt"                   jdbcType="DECIMAL"   property="amt" />
+        <result column="present_amt"           jdbcType="DECIMAL"   property="presentAmt" />
+        <result column="create_time"           jdbcType="TIMESTAMP" property="createTime" />
+        <result column="station_id"            jdbcType="INTEGER"   property="stationId" />
+        <result column="station_name"          jdbcType="VARCHAR"   property="stationName" />
+    </resultMap>
+
+    <!--查询客户电子会员卡的使用记录-->
+    <select id="getCardUseRecordList" resultMap="CardRecordBaseResultMap" parameterType="com.platform.yijia.pojo.CustomerCardUseRecord">
+         SELECT
+            id,
+            order_no,
+            union_id,
+            customer_name,
+            usage_type,
+            type,
+            oils_type,
+            amt,
+            present_amt,
+            create_time,
+            station_id,
+            station_name
+         FROM
+            customer_card_use_record
+        <where>
+            <if test=" usageType !=null and usageType !=''">
+                usage_type = #{usageType}
+            </if>
+            <if test="stationId !=null and stationId !=''">
+                AND station_id = #{stationId}
+            </if>
+            <if test="unionId !=null and unionId !=''">
+                AND union_id = #{unionId}
+            </if>
+        </where>
+    </select>
+
+
   <!--查询用户储蓄卡-->
-  <select id="getElectronicCardList" resultMap="BaseResultMap" parameterType="com.platform.yijia.pojo.CustomerElectronicCard">
+  <select id="getElectronicCardList" resultMap="CardBaseResultMap" parameterType="com.platform.yijia.pojo.CustomerElectronicCard">
     SELECT
         id,
         union_id,