修改支付查询子商户

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

@@ -130,7 +130,7 @@ public class PayController {
         //String token=payInfoRequest.getToken();//token
         String openId = payInfoRequest.getOpenId(); //用户openId
         String userType=payInfoRequest.getUserType();//用户登录类型 1 公众号。2 小程序
-        String mno=payInfoRequest.getMno();//获取商户号
+        //String mno=payInfoRequest.getMno();//获取商户号
         Integer orderId =payInfoRequest.getOrderId();
         //根据token 和登录类型 身份验证
         AppUserInfo appUserInfo =new AppUserInfo();
@@ -155,7 +155,6 @@ public class PayController {
                     JSONObject reqData = new JSONObject();
 
                     reqData.put("ordNo", payOrder.getOrderNo()); //商户订单号
-                    reqData.put("mno", mno); //商户编号
                     //reqData.put("subMechId", ""); //子商户号
                     reqData.put("amt", payOrder.getAmt()); //订单总金额
                     //reqData.put("amt", "0.01");
@@ -180,9 +179,11 @@ public class PayController {
                     // reqData.put("customerIp", ""); //持卡人ip地址，银联js支付时必传
 
                     Map<String, String> stationAppIdAndAppSecret = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
-                    if(stationAppIdAndAppSecret !=null && stationAppIdAndAppSecret.containsKey("appId")){
+                    if(stationAppIdAndAppSecret !=null && stationAppIdAndAppSecret.containsKey("appId") && stationAppIdAndAppSecret.containsKey("mno")){
                         reqData.put("subAppid", stationAppIdAndAppSecret.get("appId")); //微信子公众号
+                        reqData.put("mno", stationAppIdAndAppSecret.get("mno")); //商户编号
                         logger.info("支付子商户："+ stationAppIdAndAppSecret.get("appId"));
+                        logger.info("商户编号："+ stationAppIdAndAppSecret.get("mno"));
                     }
                     //reqData.put("outFrontUrl", ""); //js 支付，前台 成功通知地址
                     //reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址

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

@@ -475,6 +475,7 @@
   <!--查询油站小程序AppId和AppSecret-->
   <select id="getStationAppIdAndAppSecret" parameterType="Integer" resultType="Map">
     SELECT
+        mno             AS mno,
         app_id          AS appId,
         app_secret      AS appSecret
     FROM