shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123333

Browse Source
This commit is contained in:
张良(004796)
2024-02-05 16:16:12 +08:00
parent caac9f5cc1
commit 99e0772540
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
View File

@@ -44,6 +44,9 @@ public class PayController {
@Autowired @Autowired
private PayManager payManager; private PayManager payManager;
private static final String NOTIFY_WX_URL = "/api/pay/wx/notify";
private static final String NOTIFY_ALI_URL = "/api/pay/ali/notify";
@PostMapping(value = "/wx") @PostMapping(value = "/wx")
@Operation(summary = "微信支付") @Operation(summary = "微信支付")
@Log(title = "微信支付", businessType = BusinessType.OTHER, isSaveDb = true) @Log(title = "微信支付", businessType = BusinessType.OTHER, isSaveDb = true)
@@ -67,7 +70,7 @@ public class PayController {
.out_trade_no(WxPayKit.generateStr()) .out_trade_no(WxPayKit.generateStr())
.total_fee(payOrderInfo.getPriceFenStr()) .total_fee(payOrderInfo.getPriceFenStr())
.spbill_create_ip(ip) .spbill_create_ip(ip)
.notify_url(payConfig.getNotifyUrl()) .notify_url(payConfig.getNotifyUrl()+NOTIFY_WX_URL)
.trade_type(TradeType.APP.getTradeType()) .trade_type(TradeType.APP.getTradeType())
.build() .build()
.createSign(payConfig.getWxKey(), SignType.HMACSHA256); .createSign(payConfig.getWxKey(), SignType.HMACSHA256);
@@ -117,7 +120,7 @@ public class PayController {
model.setTimeoutExpress("30m"); model.setTimeoutExpress("30m");
model.setTotalAmount(payOrderInfo.getPrice().toString()); model.setTotalAmount(payOrderInfo.getPrice().toString());
String notifyUrl = AliPayApiConfigKit.getAliPayApiConfig().getServiceUrl(); String notifyUrl = AliPayApiConfigKit.getAliPayApiConfig().getServiceUrl();
String orderInfo = AliPayApi.appPayToResponse(model, notifyUrl).getBody(); String orderInfo = AliPayApi.appPayToResponse(model, notifyUrl+NOTIFY_ALI_URL).getBody();
PayReturnResp resp = new PayReturnResp(); PayReturnResp resp = new PayReturnResp();
resp.setData(orderInfo); resp.setData(orderInfo);
return R.ok(resp); return R.ok(resp);

2
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PayConfig.java
View File

@@ -53,7 +53,7 @@ public class PayConfig implements Serializable {
*/ */
private String publicKey; private String publicKey;
/** /**
* * 回调域名
*/ */
private String notifyUrl; private String notifyUrl;
/** /**