czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tkk' into test

Browse Source
This commit is contained in:
Tankaikai
2024-09-29 10:53:47 +08:00
parent 8bc06c2a6a 54207e7be5
commit c2c92d9fc2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -325,8 +325,6 @@ public class PayService {
String appToken = thirdApply.getAppToken(); String appToken = thirdApply.getAppToken();
if ("aliPay".equals(payType)){ if ("aliPay".equals(payType)){
smallAppid = thirdApply.getAlipaySmallAppid(); smallAppid = thirdApply.getAlipaySmallAppid();
appId = thirdApply.getAlipayAppId();
appToken = thirdApply.getAlipayAppToken();
} }
String convertPayType = "aliPay".equals(payType) ? "ALIPAY" : "WECHAT"; String convertPayType = "aliPay".equals(payType) ? "ALIPAY" : "WECHAT";
PublicResp<WxScanPayResp> publicResp = thirdPayService.scanpay(thirdUrl, PublicResp<WxScanPayResp> publicResp = thirdPayService.scanpay(thirdUrl,
@@ -682,8 +680,6 @@ public class PayService {
String appToken = thirdApply.getAppToken(); String appToken = thirdApply.getAppToken();
if ("aliPay".equals(payType)){ if ("aliPay".equals(payType)){
smallAppid = thirdApply.getAlipaySmallAppid(); smallAppid = thirdApply.getAlipaySmallAppid();
appId = thirdApply.getAlipayAppId();
appToken = thirdApply.getAlipayAppToken();
} }
String convertPayType = "aliPay".equals(payType) ? "ALIPAY" : "WECHAT"; String convertPayType = "aliPay".equals(payType) ? "ALIPAY" : "WECHAT";
PublicResp<WxScanPayResp> publicResp = thirdPayService.scanpay( PublicResp<WxScanPayResp> publicResp = thirdPayService.scanpay(