Merge branch 'tkk' into test

This commit is contained in:
Tankaikai
2024-09-29 10:53:47 +08:00

View File

@@ -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(