Merge branch 'main' of https://git.mowei.com.cn/wyh/gan

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

@@ -475,7 +475,7 @@ public class PayController extends BaseController
 
     @PostMapping("/aliPay")
     @ApiOperation(value = "支付宝支付", notes = "支付宝支付", httpMethod = "POST")
-    public AjaxResult aliPay(@RequestBody AppOrderArg appOrderArg) {
+    public String 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 AjaxResult.success(result.getBody());
+            return result.getBody();
         } else {
-            return AjaxResult.error(result.getMsg());
+            return null;
         }
     }
 }