修改api

src/main/java/com/mmc/payment/controller/WechatPayController.java

@@ -30,7 +30,7 @@ public class WechatPayController extends BaseController {
     @ApiOperation(value = "小程序调起支付API")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("pay")
-    public ResultBody orderPay(@RequestBody OrderRequestParamsVO orderRequestParamsVO, HttpServletRequest request) throws IOException {
+    public Map orderPay(@RequestBody OrderRequestParamsVO orderRequestParamsVO, HttpServletRequest request) throws IOException {
         return wechatPayService.orderPay(orderRequestParamsVO, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request);
     }
 

src/main/java/com/mmc/payment/service/Impl/WechatPayServiceImpl.java

@@ -63,7 +63,7 @@ public class WechatPayServiceImpl implements WechatPayService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultBody orderPay(OrderRequestParamsVO orderRequestParamsVO, Integer userAccountId, HttpServletRequest request) throws IOException {
+    public Map orderPay(OrderRequestParamsVO orderRequestParamsVO, Integer userAccountId, HttpServletRequest request) {
         UserAccountSimpleDTO userSimpleInfo = userAppApi.feignGetUserSimpleInfo(userAccountId, request.getHeader("token"));
         if (userSimpleInfo == null) {
             throw new RuntimeException("服务器内部错误！");
@@ -72,7 +72,7 @@ public class WechatPayServiceImpl implements WechatPayService {
         // 查询该订单是否已下单
         WxPayLogDO wxPayLogDO = wechatPayDao.selectWxPayInfoByOrderNo(orderRequestParamsVO.getOrderNo());
         if (wxPayLogDO != null && wxPayLogDO.getTradeState().equals(OrderPayStatus.SUCCESS.getStatus())) {
-            return ResultBody.error("订单已支付!");
+            throw new RuntimeException("订单已支付!");
         } else if (wxPayLogDO == null) {
             // 构建service
             JsapiService jsapiService = new JsapiService.Builder().config(config).build();
@@ -105,10 +105,10 @@ public class WechatPayServiceImpl implements WechatPayService {
             // 往数据库插入下单的日志信息
             wechatPayDao.insertWxPayLog(wxPrepayLogDO);
             Map<String, Object> map = getSignInfoMap(config, prepayId);
-            return ResultBody.success(map);
+            return map;
         } else {
             Map<String, Object> map = getSignInfoMap(config, wxPayLogDO.getPrepayId());
-            return ResultBody.success(map);
+            return map;
         }
     }
 

src/main/java/com/mmc/payment/service/WechatPayService.java

@@ -14,7 +14,7 @@ import java.util.Map;
  * 概要：
  */
 public interface WechatPayService {
-    ResultBody orderPay(OrderRequestParamsVO orderRequestParamsVO, Integer userAccountId, HttpServletRequest request) throws IOException;
+    Map orderPay(OrderRequestParamsVO orderRequestParamsVO, Integer userAccountId, HttpServletRequest request) throws IOException;
 
     Map payCallback(HttpServletRequest request);