|
|
@@ -7,10 +7,7 @@ import com.platform.yijia.param.request.*;
|
|
|
import com.platform.yijia.pojo.AppUserInfo;
|
|
|
import com.platform.yijia.pojo.CustomerManage;
|
|
|
import com.platform.yijia.pojo.PayOrder;
|
|
|
-import com.platform.yijia.service.AppUserInfoService;
|
|
|
-import com.platform.yijia.service.CustomerGradeServices;
|
|
|
-import com.platform.yijia.service.PayOrderService;
|
|
|
-import com.platform.yijia.service.StationOilGunService;
|
|
|
+import com.platform.yijia.service.*;
|
|
|
import com.platform.yijia.utils.*;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -35,6 +32,8 @@ public class PayController {
|
|
|
private StationOilGunService stationOilGunService;
|
|
|
@Resource
|
|
|
private CustomerGradeServices customerGradeServices;
|
|
|
+ @Resource
|
|
|
+ private StationService stationService;
|
|
|
|
|
|
/***
|
|
|
* 微信子商户支付接口
|
|
|
@@ -179,7 +178,12 @@ public class PayController {
|
|
|
reqData.put("tradeSource", "01"); //交易来源 01服务商，02收银台，03硬件
|
|
|
reqData.put("trmIp", "172.16.2.1");//商家ip地址
|
|
|
// reqData.put("customerIp", ""); //持卡人ip地址，银联js支付时必传
|
|
|
- //reqData.put("subAppid", "wx24210004370ec43b"); //微信子公众号
|
|
|
+
|
|
|
+ Map<String, String> stationAppIdAndAppSecret = stationService.getStationAppIdAndAppSecret(payInfoRequest.getStationId());
|
|
|
+ if(stationAppIdAndAppSecret !=null && stationAppIdAndAppSecret.containsKey("appId")){
|
|
|
+ reqData.put("subAppid", stationAppIdAndAppSecret.get("appId")); //微信子公众号
|
|
|
+ logger.info("支付子商户："+ stationAppIdAndAppSecret.get("appId"));
|
|
|
+ }
|
|
|
//reqData.put("outFrontUrl", ""); //js 支付，前台 成功通知地址
|
|
|
//reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址
|
|
|
reqData.put("notifyUrl", "https://www.huijy.net/api/getCallback"); //回调地址
|
JK