wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wyh:2b14390c27fa76ae79dc5ff1a8f0e08a7943f54d
Branches Tags
wyh:main
...
compare: wyh:829046e1313f0dea29eee6c8813c07608342dd19
Branches Tags
wyh:main

2 Commits
2b14390c27 ... 829046e131

Author SHA1 Message Date
王宇航 829046e131 Merge branch 'main' of https://git.mowei.com.cn/wyh/gan 2024-05-10 13:38:14 +08:00
王宇航 6940f67264 支付宝支付修改 2024-05-10 13:38:00 +08:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
View File

@ -475,7 +475,7 @@ public class PayController extends BaseController
@PostMapping("/aliPay") @PostMapping("/aliPay")
@ApiOperation(value = "支付宝支付", notes = "支付宝支付", httpMethod = "POST") @ApiOperation(value = "支付宝支付", notes = "支付宝支付", httpMethod = "POST")
public AjaxResult aliPay(@RequestBody AppOrderArg appOrderArg) { public String aliPay(@RequestBody AppOrderArg appOrderArg) {
String orderNo = KeyUtil.generateUniqueKey(); String orderNo = KeyUtil.generateUniqueKey();
AlipayTradeCreateResponse result = null; AlipayTradeCreateResponse result = null;
try { try {
@ -494,9 +494,9 @@ public class PayController extends BaseController
order.setCreateTime(new Date()); order.setCreateTime(new Date());
order.setLevel(appOrderArg.getLevel()); order.setLevel(appOrderArg.getLevel());
appOrderMapper.insertAppOrder(order); appOrderMapper.insertAppOrder(order);
return AjaxResult.success(result.getBody()); return result.getBody();
} else { } else {
return AjaxResult.error(result.getMsg()); return null;
} }
} }
} }