修改字段名

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

@@ -456,7 +456,7 @@ public class PayController {
                 PayOrder payOrder=payOrderService.selectOrderInfoByOrdNo(ordNo);
                 if(payOrder!=null ){
                     if(payOrder.getStatus() !=null && payOrder.getStatus().equals("0")){
-                        if(stationInfos.getPayChannelType() !=null && stationInfos.getPayChannelType().equals("2")){
+                        if(stationInfos.getThirdPayment() !=null && stationInfos.getThirdPayment().equals("02")){
                             /******************************************************云闪付支付***********************************************************/
                             //云闪付支付方式
                             Map<String, String> staPayChannelInfo = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
@@ -496,7 +496,7 @@ public class PayController {
 
                                 //返回前端字段
                                 Map<String, Object> reqData = new HashMap<>();
-                                reqData.put("payChannelType", stationInfos.getPayChannelType());
+                                reqData.put("thirdPayment", stationInfos.getThirdPayment());
                                 //Map<String, Object> resultMap = new HashMap<>();
                                 if(response !=null && response.getResult_code().equals("01")){
                                     reqData.put("payTimeStamp", response.getTimeStamp());
@@ -653,7 +653,7 @@ public class PayController {
                                 r.put("msg", result.get("msg"));
                             }
                             logger.info("随行付支付时系统返回前端参数字段：" +r);
-                            r.put("payChannelType", "1");
+                            r.put("thirdPayment", "01");
                             resultData=ResultData.success(r);
                         }
                     }else {

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

@@ -153,14 +153,14 @@ public class StationInfo {
     private String city;                    //油站所在市
     private String jiBie;                   //级别
     private String isAliPayFlag;
-    private String payChannelType;      //支付通道类型
+    private String thirdPayment;      //支付通道类型
 
-    public String getPayChannelType() {
-        return payChannelType;
+    public String getThirdPayment() {
+        return thirdPayment;
     }
 
-    public void setPayChannelType(String payChannelType) {
-        this.payChannelType = payChannelType;
+    public void setThirdPayment(String thirdPayment) {
+        this.thirdPayment = thirdPayment;
     }
 
     private Integer pageSize;//每页条数

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

@@ -50,7 +50,7 @@
     <result column="app_id"               jdbcType="VARCHAR" property="appId" />
     <result column="gzh_app_id"           jdbcType="VARCHAR" property="gzhAppId" />
     <result column="is_alipay_flag"           jdbcType="VARCHAR" property="isAliPayFlag" />
-    <result column="pay_channel_type"         jdbcType="VARCHAR" property="payChannelType" />
+    <result column="third_payment"         jdbcType="VARCHAR" property="thirdPayment" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.platform.yijia.pojo.StationInfo">
     <result column="station_pic" jdbcType="LONGVARBINARY" property="stationPic" />
@@ -203,7 +203,7 @@
         T1.coupon_flag,
         T1.coupon_enabled_flag,
         T1.is_alipay_flag,
-        T1.pay_channel_type,
+        T1.third_payment,
         T2.card_enabled_flag    AS card_enabled_flag_group,
         T2.card_rule_flag       AS card_rule_flag_group,
         T2.integral_flag        AS integral_flag_group,