Merge branch 'tkk' into test
This commit is contained in:
@@ -325,8 +325,6 @@ public class PayService {
|
||||
String appToken = thirdApply.getAppToken();
|
||||
if ("aliPay".equals(payType)){
|
||||
smallAppid = thirdApply.getAlipaySmallAppid();
|
||||
appId = thirdApply.getAlipayAppId();
|
||||
appToken = thirdApply.getAlipayAppToken();
|
||||
}
|
||||
String convertPayType = "aliPay".equals(payType) ? "ALIPAY" : "WECHAT";
|
||||
PublicResp<WxScanPayResp> publicResp = thirdPayService.scanpay(thirdUrl,
|
||||
@@ -682,8 +680,6 @@ public class PayService {
|
||||
String appToken = thirdApply.getAppToken();
|
||||
if ("aliPay".equals(payType)){
|
||||
smallAppid = thirdApply.getAlipaySmallAppid();
|
||||
appId = thirdApply.getAlipayAppId();
|
||||
appToken = thirdApply.getAlipayAppToken();
|
||||
}
|
||||
String convertPayType = "aliPay".equals(payType) ? "ALIPAY" : "WECHAT";
|
||||
PublicResp<WxScanPayResp> publicResp = thirdPayService.scanpay(
|
||||
|
||||
Reference in New Issue
Block a user