修改电子卡充值接口

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

@@ -5,11 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.google.gson.Gson;
 import com.platform.yijia.param.request.RechargeBalance;
+import com.platform.yijia.pojo.CustomerCardSetting;
+import com.platform.yijia.pojo.CustomerCardSettingDetail;
 import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 import com.platform.yijia.service.ElectronicMembershipCardService;
 import com.platform.yijia.service.StationService;
 import com.platform.yijia.utils.*;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /*
@@ -29,7 +33,6 @@ import java.util.*;
 @Controller
 @RequestMapping("/demo")
 public class ElectronicMembershipCardController {
-
     private static Logger logger =(Logger) LoggerFactory.getLogger(ElectronicMembershipCardController.class);
 
     @Resource
@@ -37,7 +40,7 @@ public class ElectronicMembershipCardController {
     @Resource
     private StationService stationService;
 
-    //获取用户储蓄卡列表
+    //获取用户电子会员卡（储蓄卡）列表
     @RequestMapping(value = "/getElectronicCardList", method = RequestMethod.GET)
     @ResponseBody
     public String getElectronicCardList(@RequestParam Integer stationId, String unionId){
@@ -56,72 +59,112 @@ public class ElectronicMembershipCardController {
         return gson.toJson(resultData);
     }
 
-    //用户充值储蓄卡拉起随行付支付接口
+    //用户充值电子会员卡（储蓄卡）生成充值记录
     @RequestMapping(value = "/rechargeBalance", method = RequestMethod.POST)
     @ResponseBody
-    public String rechargeBalance(RechargeBalance rechargeBalance){
+    public String rechargeBalance(@RequestBody RechargeBalance rechargeBalance){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
         if(rechargeBalance !=null){
             BigDecimal amt = new BigDecimal(rechargeBalance.getAmt());
-            String openId = rechargeBalance.getOpenId();    //公众号的openId
+            //String openId = rechargeBalance.getOpenId();    //公众号的openId
             Integer stationId = rechargeBalance.getStationId();
-            BigDecimal presentAmt = new BigDecimal(rechargeBalance.getPresentAmt());
+            //BigDecimal presentAmt = new BigDecimal(rechargeBalance.getPresentAmt());
+            String payType = rechargeBalance.getPayType();
             String customerName = rechargeBalance.getCustomerName();
             String cardOilsType = rechargeBalance.getCardOilsType();
             String unionId = rechargeBalance.getUnionId();
             String stationName = rechargeBalance.getStationName();
-            //电子会员卡使用记录
-            CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
-            customerCardUseRecord.setUnionId(unionId);
-            customerCardUseRecord.setStationId(stationId);
-            customerCardUseRecord.setAmt(amt);
-            customerCardUseRecord.setPresentAmt(presentAmt);
-            customerCardUseRecord.setCardOilsType(cardOilsType);
-            customerCardUseRecord.setStationName(stationName);
-            customerCardUseRecord.setCustomerName(customerName);
-            customerCardUseRecord.setUsageType("+");
-            customerCardUseRecord.setType("1");      //1表示微信
-            customerCardUseRecord.setCreateTime(new Date());
-            customerCardUseRecord.setStatus("0");
-            //订单规则 时间+6位随机数
-            Random random = new Random();
-            String str="";
-            for(int i=0; i<6; i++){
-                str+=random.nextInt(10);
-            }
-            String orderNo = System.nanoTime()+str;
-            customerCardUseRecord.setOrderNo(orderNo);
+            String stationCardEnabledFlag = electronicMembershipCardService.getStationCardEnabledFlag(stationId);
+            //是否启用电子卡功能
+            if(stationCardEnabledFlag.equals("1")){
+                //CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();       //电子会员卡
+                CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();      //电子会员卡使用记录
+                CustomerCardSetting customerCardSetting = new CustomerCardSetting();        //电子卡优惠规则设置
 
-            //电子会员卡
-            CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
-//            customerElectronicCard.setUnionId(unionId);
-//            customerElectronicCard.setStationId(stationId);
-//            customerElectronicCard.setCardOilsType(cardOilsType);
-            customerElectronicCard.setId(rechargeBalance.getId());
-            customerElectronicCard.setRecentlyTime(new Date());
-
-            //获取当前用户要充值的的电子会员卡信息
-            CustomerElectronicCard electronicCardInfo = electronicMembershipCardService.getElectronicCardInfo(customerElectronicCard);
-            if(electronicCardInfo != null){
-                BigDecimal amtBalance = electronicCardInfo.getAmt();        //用户当前卡内余额
-                if(presentAmt !=null){  //有赠送金额时
-                    customerElectronicCard.setAmt(amtBalance.add(presentAmt).add(amt));
-                }else { //无赠送金额时
-                    customerElectronicCard.setAmt(amtBalance.add(amt));
+                customerCardSetting.setStationId(stationId);
+                customerCardSetting.setCardOilsType(cardOilsType);
+                //获取用户要充值电子卡的优惠规则信息
+                List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
+                if(cardRechargeSettingList !=null && cardRechargeSettingList.size() ==1){
+                    String discountTime = cardRechargeSettingList.get(0).getDiscountTime();
+                    String[] dctime={};     //会员充值活动时间
+                    if(discountTime.contains(",")){
+                        dctime =discountTime.split(",");
+                    }else {
+                        dctime =new String[1];
+                        dctime[0] = discountTime;
+                    }
+                    String currentTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); //当前时间
+                    //循环优惠规则明细
+                    for (CustomerCardSettingDetail cardDetail : cardRechargeSettingList.get(0).getCustomerCardSettingDetailList()){
+                        if(amt.compareTo(cardDetail.getDiscountAmtTerm()) ==1 || amt.compareTo(cardDetail.getDiscountAmtTerm()) ==0){
+                            //String isDiscountCoupon = cardRechargeSettingList.get(0).getIsDiscountCoupon();       //是否使用优惠券
+                            //充值优惠类型
+                            if(cardDetail.getSettingRuleType().equals("1")){ //按充值金额
+                                BigDecimal presentAmt = cardDetail.getPresentAmt(); //当前赠送金额
+                                if(dctime !=null){
+                                    for (String str : dctime){
+                                        if(str.contains(currentTime)){  //如果当前时间在会员日活动时间内
+                                            //计算会员日内的总赠送积分
+                                            if(cardRechargeSettingList.get(0).getPresentScale() !=null){
+                                                presentAmt = presentAmt.multiply(new BigDecimal(cardRechargeSettingList.get(0).getPresentScale())).add(presentAmt);
+                                            }
+                                            break;
+                                        }
+                                    }
+                                }
+                                customerCardUseRecord.setAmt(amt);
+                                customerCardUseRecord.setPresentAmt(presentAmt);
+                            }else if(cardDetail.getSettingRuleType().equals("2")){      //按充值金额的比例
+                                BigDecimal presentAmt = amt.multiply(cardDetail.getPresentAmt().divide(new BigDecimal(100))); //当前赠送金额比例的赠送积分
+                                if(dctime !=null){
+                                    for (String str : dctime){
+                                        if(str.contains(currentTime)){  //如果当前时间在会员日活动时间内
+                                            //计算会员日期内的总赠送积分
+                                            if(cardRechargeSettingList.get(0).getPresentScale() !=null){
+                                                presentAmt = presentAmt.multiply(new BigDecimal(cardRechargeSettingList.get(0).getPresentScale())).add(presentAmt);
+                                            }
+                                            break;
+                                        }
+                                    }
+                                }
+                                customerCardUseRecord.setAmt(amt);
+                                customerCardUseRecord.setPresentAmt(presentAmt);
+                            }
+                            break;
+                        }
+                    }
+                }else {
+                    customerCardUseRecord.setAmt(amt);
+                    customerCardUseRecord.setPresentAmt(new BigDecimal(0));
+                }
+                customerCardUseRecord.setUnionId(unionId);
+                customerCardUseRecord.setStationId(stationId);
+                customerCardUseRecord.setCardOilsType(cardOilsType);
+                customerCardUseRecord.setStationName(stationName);
+                customerCardUseRecord.setCustomerName(customerName);
+                customerCardUseRecord.setUsageType("+");
+                customerCardUseRecord.setPayType(payType);      //1表示微信
+                customerCardUseRecord.setCreateTime(new Date());
+                customerCardUseRecord.setStatus("0");
+                //订单规则 时间+6位随机数
+                Random random = new Random();
+                String str="";
+                for(int i=0; i<6; i++){
+                    str+=random.nextInt(10);
                 }
-                electronicMembershipCardService.updateElectronicCardInfo(customerElectronicCard);   //更新电子会员看余额信息
+                String orderNo = System.nanoTime()+str;
+                customerCardUseRecord.setOrderNo(orderNo);
                 electronicMembershipCardService.insetCardUseRecord(customerCardUseRecord);      //插入电子会员卡的使用记录
                 resultData = ResultData.success(orderNo);
-            }else {
-                resultData = ResultData.error(CodeMsg.USER_EXSIST_CARD);
             }
         }
         return gson.toJson(resultData);
     }
 
-    //用户充值储蓄卡拉起随行付支付接口
+    //用户充值电子会员卡（储蓄卡）拉起随行付支付接口
     @RequestMapping(value = "/rechargeBalanceSXFPay", method = RequestMethod.POST)
     @ResponseBody
     public String rechargeBalanceSXFPay(@RequestBody RechargeBalance rechargeBalance){
@@ -237,7 +280,7 @@ public class ElectronicMembershipCardController {
         return gson.toJson(resultData);
     }
 
-    //电子会员卡（储蓄卡）充值功能随行付回调功能
+    //用户电子会员卡（储蓄卡）充值功能随行付回调功能
     @RequestMapping(value = "/getCardRechargeCallback", consumes = "application/json", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
@@ -366,9 +409,15 @@ public class ElectronicMembershipCardController {
             if(customerCardUseRecordInfo !=null && customerCardUseRecordInfo.getStatus().equals("0")){
                 CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
                 customerElectronicCard.setUnionId(customerCardUseRecord.getUnionId());
-                customerElectronicCard.setAmt(new BigDecimal(amt));
+                //是否有赠送金额
+                if(customerCardUseRecordInfo.getPresentAmt() !=null){
+                    BigDecimal presentAmt = customerCardUseRecordInfo.getPresentAmt();  //客户充值赠送金额
+                    customerElectronicCard.setAmt(new BigDecimal(amt).add(presentAmt));
+                }else {
+                    customerElectronicCard.setAmt(new BigDecimal(amt));
+                }
                 customerElectronicCard.setRecentlyTime(new Date());
-                electronicMembershipCardService.updateElectronicCardInfo(customerElectronicCard);
+                electronicMembershipCardService.updateElectronicCardInfoByUnionId(customerElectronicCard);
                 customerCardUseRecord.setStatus("1");
                 electronicMembershipCardService.updateCardRecordStatusByOrderNo(customerCardUseRecord);
                 logger.info("=====================电子会员卡充值成功=============================");
@@ -378,8 +427,7 @@ public class ElectronicMembershipCardController {
         }
     }
 
-
-    //获取用户储蓄卡充值记录
+    //获取用户电子会员卡（储蓄卡）充值记录
     @RequestMapping(value = "/getCardRechargeRecord", method = RequestMethod.GET)
     @ResponseBody
     public String getCardRechargeRecord(@RequestParam Integer stationId, String unionId){
@@ -399,7 +447,7 @@ public class ElectronicMembershipCardController {
         return gson.toJson(resultData);
     }
 
-    //获取用户储蓄卡消费记录
+    //获取用户电子会员卡（储蓄卡）消费记录
     @RequestMapping(value = "/getCardConsumptionRecord", method = RequestMethod.GET)
     @ResponseBody
     public String getCardConsumptionRecord(@RequestParam Integer stationId, String unionId){
@@ -419,5 +467,23 @@ public class ElectronicMembershipCardController {
         return gson.toJson(resultData);
     }
 
+    //查询油站电子会员卡（储蓄卡）充值设置规则
+    @RequestMapping(value = "/getCardRechargeSettingList", method = RequestMethod.GET)
+    @ResponseBody
+    public String getCardRechargeSettingList(@RequestParam Integer stationId, String cardOilsType){
+        Gson gson =new Gson();
+        //返回结果集
+        ResultData resultData = null;
+        if(stationId !=null && StringUtils.isNotBlank(cardOilsType)){
+            CustomerCardSetting customerCardSetting = new CustomerCardSetting();
+            customerCardSetting.setStationId(stationId);
+            customerCardSetting.setCardOilsType(cardOilsType);
+            List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
+            resultData = ResultData.success(cardRechargeSettingList);
+        }else {
+            resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
+        }
+        return gson.toJson(resultData);
+    }
 
 }

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

@@ -1,6 +1,7 @@
 package com.platform.yijia.dao;
 
 
+import com.platform.yijia.pojo.CustomerCardSetting;
 import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 
@@ -32,4 +33,9 @@ public interface ElectronicMembershipCardMapper {
     //根据订单号更新用户充值记录的状态
     void updateCardRecordStatusByOrderNo(CustomerCardUseRecord customerCardUseRecord);
 
+    //查询油站电子会员卡（储蓄卡）充值设置规则
+    List<CustomerCardSetting> getCardRechargeSettingList(CustomerCardSetting customerCardSetting);
+
+    //查询油站的会员卡启用标识 （1、启动 2，停用)
+    String getStationCardEnabledFlag(Integer stationId);
 }

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

@@ -15,7 +15,7 @@ public class CustomerCardUseRecord {
     private String unionId;        //'微信用户唯一标识',
     private String customerName;    //''客户名'',
     private String usageType;            //'电子会员卡消费充值类型：+，充值；-，消费；',
-    private String type;      //'电子会员卡充值消费类型：1.微信；2.POS机',
+    private String payType;      //'电子会员卡充值消费类型：1.微信；2.POS机',
     private String cardOilsType;        //油类：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.CustomerCardSetting;
 import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 
@@ -31,4 +32,10 @@ public interface ElectronicMembershipCardService {
     //根据订单号更新用户充值记录的状态
     void updateCardRecordStatusByOrderNo(CustomerCardUseRecord customerCardUseRecord);
 
+    //查询油站电子会员卡（储蓄卡）充值设置规则
+    List<CustomerCardSetting> getCardRechargeSettingList(CustomerCardSetting customerCardSetting);
+
+    //查询油站的会员卡启用标识 （1、启动 2，停用)
+    String getStationCardEnabledFlag(Integer stationId);
+
 }

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.CustomerCardSetting;
 import com.platform.yijia.pojo.CustomerCardUseRecord;
 import com.platform.yijia.pojo.CustomerElectronicCard;
 import com.platform.yijia.pojo.IntegralRule;
@@ -17,12 +18,24 @@ public class ElectronicMembershipCardServiceImpl implements ElectronicMembership
     @Resource
     private ElectronicMembershipCardMapper electronicMembershipCardMapper;
 
+    //查询油站电子会员卡（储蓄卡）充值设置规则
+    @Override
+    public List<CustomerCardSetting> getCardRechargeSettingList(CustomerCardSetting customerCardSetting) {
+        return electronicMembershipCardMapper.getCardRechargeSettingList(customerCardSetting);
+    }
+
     //根据unionId更新客户余额
     @Override
     public void updateElectronicCardInfoByUnionId(CustomerElectronicCard customerElectronicCard) {
         electronicMembershipCardMapper.updateElectronicCardInfoByUnionId(customerElectronicCard);
     }
 
+    //查询油站的会员卡启用标识 （1、启动 2，停用)
+    @Override
+    public String getStationCardEnabledFlag(Integer stationId) {
+        return electronicMembershipCardMapper.getStationCardEnabledFlag(stationId);
+    }
+
     //根据订单号查询用户的充值记录
     @Override
     public CustomerCardUseRecord getCardRecordByOrderNo(CustomerCardUseRecord customerCardUseRecord) {

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

@@ -9,7 +9,7 @@
       <result column="customer_no"             jdbcType="VARCHAR"   property="customerNo" />
       <result column="customer_name"           jdbcType="VARCHAR"   property="customerName" />
       <result column="amt"                     jdbcType="DECIMAL"   property="amt" />
-      <result column="card_oils_type"               jdbcType="VARCHAR"   property="cardOilsType" />
+      <result column="card_oils_type"          jdbcType="VARCHAR"   property="cardOilsType" />
       <result column="station_id"              jdbcType="INTEGER"   property="stationId" />
       <result column="station_name"            jdbcType="VARCHAR"   property="stationName" />
       <result column="create_time"             jdbcType="TIMESTAMP" property="createTime" />
@@ -23,16 +23,69 @@
         <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="pay_type"              jdbcType="VARCHAR"   property="payType" />
         <result column="card_oils_type"        jdbcType="VARCHAR"   property="cardOilsType" />
         <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" />
-        <result column="status"               jdbcType="VARCHAR"   property="status" />
+        <result column="status"                jdbcType="VARCHAR"   property="status" />
     </resultMap>
 
+    <!--储蓄卡充值规则返回结果-->
+    <resultMap id="CardSettingBaseResultMap" type="com.platform.yijia.pojo.CustomerCardSetting">
+        <id     column="id"                         jdbcType="INTEGER"    property="id" />
+        <result column="card_oils_type"             jdbcType="VARCHAR"    property="cardOilsType" />
+        <result column="discount_time"              jdbcType="VARCHAR"    property="discountTime" />
+        <result column="present_scale"              jdbcType="VARCHAR"    property="presentScale" />
+        <result column="is_discount_coupon"         jdbcType="VARCHAR"    property="isDiscountCoupon" />
+        <result column="enjoy_integral_multiple"    jdbcType="DATE"       property="enjoyIntegralMultiple" />
+        <result column="station_id"                 jdbcType="INTEGER"    property="stationId" />
+        <result column="station_name"               jdbcType="VARCHAR"    property="stationName" />
+        <result column="create_time"                jdbcType="VARCHAR"    property="createTime" />
+        <collection property="customerCardSettingDetailList" resultMap="CardSettingDetailResultMap"/>
+    </resultMap>
+
+    <!--储蓄卡充值规则明细表-->
+    <resultMap id="CardSettingDetailResultMap" type="com.platform.yijia.pojo.CustomerCardSettingDetail">
+        <id     column="cardSettingDetailId"        jdbcType="INTEGER"      property="cardSettingDetailId" />
+        <result column="parent_id"                  jdbcType="INTEGER"      property="parentId"/>
+        <result column="setting_rule_type"          jdbcType="VARCHAR"      property="settingRuleType" />
+        <result column="discount_amt_term"          jdbcType="DECIMAL"      property="discountAmtTerm" />
+        <result column="present_amt"                jdbcType="DECIMAL"      property="presentAmt"/>
+    </resultMap>
+
+    <!--查询油站电子会员卡（储蓄卡）充值设置规则-->
+    <select id="getCardRechargeSettingList" parameterType="com.platform.yijia.pojo.CustomerCardSetting" resultMap="CardSettingBaseResultMap">
+        SELECT
+            T1.id,
+            T1.card_oils_type,
+            T1.discount_time,
+            T1.present_scale,
+            T1.is_discount_coupon,
+            T1.enjoy_integral_multiple,
+            T1.station_id,
+            T1.station_name,
+            T1.create_time,
+            T2.id                   AS      cardSettingDetailId,
+            T2.parent_id,
+            T2.setting_rule_type,
+            T2.discount_amt_term,
+            T2.present_amt
+        FROM
+            customer_card_setting AS T1 LEFT JOIN customer_card_setting_detail AS T2 ON T1.id = T2.parent_id
+        <where>
+            <if test="stationId !=null">
+                T1.station_id = #{stationId}
+            </if>
+            <if test="cardOilsType !=null">
+               AND T1.card_oils_type = #{cardOilsType}
+            </if>
+        </where>
+        ORDER BY discount_amt_term DESC
+    </select>
+
     <!--查询客户充值的订单信息-->
     <select id="getCardRecordByOrderNo" parameterType="com.platform.yijia.pojo.CustomerCardUseRecord" resultMap="CardRecordBaseResultMap">
         SELECT
@@ -41,7 +94,7 @@
             union_id,
             customer_name,
             usage_type,
-            type,
+            pay_type,
             card_oils_type,
             amt,
             present_amt,
@@ -61,7 +114,7 @@
     <!--根据订单号更新用户充值记录的状态-->
     <update id="updateCardRecordStatusByOrderNo" parameterType="com.platform.yijia.pojo.CustomerElectronicCard">
         UPDATE
-        customer_card_use_record
+            customer_card_use_record
         <set>
             <if test="status !=null">
                 status = #{status}
@@ -76,7 +129,8 @@
 
     <!--插入用户电子会员卡的使用记录-->
     <insert id="insetCardUseRecord" parameterType="com.platform.yijia.pojo.CustomerCardUseRecord">
-        INSERT INTO customer_card_use_record
+        INSERT INTO
+            customer_card_use_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderNo !=null">
                 order_no,
@@ -90,8 +144,8 @@
             <if test="usageType !=null">
                 usage_type,
             </if>
-            <if test="type !=null">
-                type,
+            <if test="payType !=null">
+                pay_type,
             </if>
             <if test="cardOilsType !=null">
                 card_oils_type,
@@ -128,8 +182,8 @@
             <if test="usageType !=null">
                 #{usageType},
             </if>
-            <if test="type !=null">
-                #{type},
+            <if test="payType !=null">
+                #{payType},
             </if>
             <if test="cardOilsType !=null">
                 #{cardOilsType},
@@ -141,7 +195,7 @@
                 #{presentAmt},
             </if>
             <if test="createTime !=null">
-                #{create_time},
+                #{createTime},
             </if>
             <if test="stationId !=null">
                 #{stationId},
@@ -163,7 +217,7 @@
             union_id,
             customer_name,
             usage_type,
-            type,
+            pay_type,
             card_oils_type,
             amt,
             present_amt,
@@ -279,7 +333,7 @@
     </update>
 
     <!--查询油站的会员卡启用标识 （1、启动 2，停用)-->
-    <select id="getStationCardEnabledFlag" parameterType="String" resultType="String">
+    <select id="getStationCardEnabledFlag" parameterType="Integer" resultType="String">
         SELECT
             card_enabled_flag AS cardEnabledFlag
         FROM