支付回调修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderPaymentServiceImpl.java

@@ -126,7 +126,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
         //支付订单号生成
         Long paymentNo = idGeneratorService.generatorId("paymentNo");
 
-        //构建汇付统一下单请求
+        //构建统一下单请求
         OpenEnum openType = OpenEnum.valueOf(paymentProperties.getOpenType());
         Payment payment = new Payment(openType, payReq.getPaymentClient(), payReq.getPayChannel());
         payment.setPaymentNo(paymentNo.toString());
@@ -180,9 +180,8 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
             userOrderService.updateStatusByOrderNo(payReq.getOrderNo(), OrderStatusEnum.PAYING.getCode());
             return HttpResponseResult.succeed(orderPayRes);
         } else {
-            //入订单付款表，同时修改订单状态
-            userOrderService.doOrderCancel(detail, OrderStatusEnum.FAIL, paymentResBaseResult.getMsg());
-            return HttpResponseResult.failed(paymentResBaseResult.getMsg());
+            //付款失败
+            throw new BizException(paymentResBaseResult.getMsg());
         }
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -307,7 +307,17 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                 && !OrderStatusEnum.PAYING.equals(detail.getStatus())) {
             return HttpResponseResult.failed("订单状态异常");
         }
-        return doOrderPay(payReq, detail);
+        try {
+            return doOrderPay(payReq, detail);
+        } catch (BizException e) {
+            //入订单付款表，同时修改订单状态
+            doOrderCancel(detail, OrderStatusEnum.FAIL, e.getMessage());
+            return HttpResponseResult.failed(e.getMessage());
+        } catch (Exception e){
+            //入订单付款表，同时修改订单状态
+            doOrderCancel(detail, OrderStatusEnum.FAIL, e.getMessage());
+            return HttpResponseResult.failed("付款失败");
+        }
     }
 
     @Override