Compare commits
No commits in common. "829046e1313f0dea29eee6c8813c07608342dd19" and "2b14390c27fa76ae79dc5ff1a8f0e08a7943f54d" have entirely different histories.
829046e131
...
2b14390c27
|
|
@ -475,7 +475,7 @@ public class PayController extends BaseController
|
|||
|
||||
@PostMapping("/aliPay")
|
||||
@ApiOperation(value = "支付宝支付", notes = "支付宝支付", httpMethod = "POST")
|
||||
public String aliPay(@RequestBody AppOrderArg appOrderArg) {
|
||||
public AjaxResult aliPay(@RequestBody AppOrderArg appOrderArg) {
|
||||
String orderNo = KeyUtil.generateUniqueKey();
|
||||
AlipayTradeCreateResponse result = null;
|
||||
try {
|
||||
|
|
@ -494,9 +494,9 @@ public class PayController extends BaseController
|
|||
order.setCreateTime(new Date());
|
||||
order.setLevel(appOrderArg.getLevel());
|
||||
appOrderMapper.insertAppOrder(order);
|
||||
return result.getBody();
|
||||
return AjaxResult.success(result.getBody());
|
||||
} else {
|
||||
return null;
|
||||
return AjaxResult.error(result.getMsg());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue