圈圈支付修改

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(payInfoRequest.getPayChannelType() !=null && payInfoRequest.getPayChannelType().equals("2")){
+                        if(stationInfos.getPayChannelType() !=null && stationInfos.getPayChannelType().equals("2")){
                             /******************************************************云闪付支付***********************************************************/
                             //云闪付支付方式
                             Map<String, String> staPayChannelInfo = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
@@ -496,10 +496,12 @@ public class PayController {
 
                                 //返回前端字段
                                 Map<String, Object> reqData = new HashMap<>();
+                                reqData.put("payChannelType", stationInfos.getPayChannelType());
                                 //Map<String, Object> resultMap = new HashMap<>();
                                 if(response !=null && response.getResult_code().equals("01")){
-                                    reqData.put("timeStamp", response.getTimeStamp());
+                                    reqData.put("payTimeStamp", response.getTimeStamp());
                                     reqData.put("payPackage", response.getPackage_str());
+                                    reqData.put("paynonceStr", response.getNonceStr());
                                     reqData.put("signType", response.getSignType());
                                     reqData.put("paySign", response.getPaySign());
                                     reqData.put("return_msg", response.getReturn_msg());
@@ -612,6 +614,7 @@ public class PayController {
                             HashMap<String, Object> result = JSON.parseObject(resultJson, LinkedHashMap.class, Feature.OrderedField);
 
                             Map<String, Object> r = new HashMap<>(); //返回前端参数
+
                             if ("0000".equals(result.get("code"))) {
                                 //验签
                                 String signResult = result.get("sign").toString();
@@ -650,6 +653,7 @@ public class PayController {
                                 r.put("msg", result.get("msg"));
                             }
                             logger.info("随行付支付时系统返回前端参数字段：" +r);
+                            r.put("payChannelType", "1");
                             resultData=ResultData.success(r);
                         }
                     }else {

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

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

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

@@ -50,6 +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" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.platform.yijia.pojo.StationInfo">
     <result column="station_pic" jdbcType="LONGVARBINARY" property="stationPic" />
@@ -201,6 +202,7 @@
         T1.balance,
         T1.coupon_flag,
         T1.coupon_enabled_flag,
+        T1.pay_channel_type,
         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,