czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"设备规格修改"

Browse Source
This commit is contained in:
hankaikai
2023-05-23 11:38:33 +08:00
parent 374396284d
commit b7793fe1ff
71 changed files with 4142 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
View File

@@ -66,6 +66,9 @@ import cn.pluss.platform.wechat.*;
import cn.pluss.platform.wx.WxAccessTokenRequest;
import cn.pluss.platform.wx.WxCommonService;
import cn.pluss.platform.wx.WxOauth2AccessTokenResponse;
import cn.pluss.platform.ys.YSConstants;
import cn.pluss.platform.ys.YsEnum;
import cn.pluss.platform.ys.YsService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
@@ -168,6 +171,9 @@ public class MerchantController {
@Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
private PayService ysPayOldService;
@Setter(onMethod_ = {@Autowired, @Qualifier("lkLPayService")})
private PayService lkLPayService;
@Setter(onMethod_ = {@Autowired})
private RyxPayService ryxPayService;
@@ -565,6 +571,8 @@ public class MerchantController {
unionInfo = ryxPayService.getUnionInfo(userAuthCode, payMentApp, channel.getMerchantId());
} else if (channel.getChannel() == 4) {
unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp, null);
} else if (channel.getChannel() == 5) {
unionInfo = lkLPayService.getUnionInfo(userAuthCode, payMentApp, null);
} else {
view.addObject("error", "未知通道类型");
return view;
@@ -1698,6 +1706,8 @@ public class MerchantController {
unionInfo = ryxPayService.getUnionInfo(userAuthCode, payMentApp, channel.getMerchantId());
} else if (channel.getChannel() == 4) {
unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp, null);
} else if (channel.getChannel() == 5) {
unionInfo = lkLPayService.getUnionInfo(userAuthCode, payMentApp, null);
} else {
view.addObject("error", "未知通道类型");
return view;
@@ -1929,6 +1939,8 @@ public class MerchantController {
return modelAndView;
} else if (channel.getChannel() == 4) {
unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp, null);
} else if (channel.getChannel() == 5) {
unionInfo = lkLPayService.getUnionInfo(userAuthCode, payMentApp, null);
} else {
modelAndView.addObject("error", "未知通道类型");
modelAndView.setViewName("/merchant/errorInfo2");