商城退款日志

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java

@@ -160,6 +160,8 @@ public class OmsPortalOrderReturnApplyServiceImpl implements OmsPortalOrderRetur
      * 退款成功
      */
     private void paymentRefundSucceededHandle(PaymentCallBack data) {
+
+        log.info("refund info is {}",data);
         if (data == null) {
             return;
         }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -520,18 +520,17 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderPayRes.setMessage("订单已付款或已关闭");
             return orderPayRes;
         }
-        UserOrderPayment userOrderPayment = userOrderPaymentService.getByOrderNo(detail.getOrderSn(),
-                                                                                 payReq.getPayChannel(),
-                                                                                 TradeStatusEnum.pending);
-
-        if (userOrderPayment != null) {
-            // 拉起原有的支付
-            orderPayRes = new OrderPayRes();
-            orderPayRes.setPay_info(userOrderPayment.getPayInfo());
-            orderPayRes.setPayChannel(userOrderPayment.getPayChannel());
-            orderPayRes.setPay_amt(userOrderPayment.getPayAmt().setScale(2, RoundingMode.HALF_UP).toString());
-            return orderPayRes;
-        }
+        // UserOrderPayment userOrderPayment = userOrderPaymentService.getByOrderNo(detail.getOrderSn(),
+        //                                              payReq.getPayChannel(),TradeStatusEnum.pending);
+        //
+        // if (userOrderPayment != null) {
+        //     // 拉起原有的支付
+        //     orderPayRes = new OrderPayRes();
+        //     orderPayRes.setPay_info(userOrderPayment.getPayInfo());
+        //     orderPayRes.setPayChannel(userOrderPayment.getPayChannel());
+        //     orderPayRes.setPay_amt(userOrderPayment.getPayAmt().setScale(2, RoundingMode.HALF_UP).toString());
+        //     return orderPayRes;
+        // }
 
         //构建汇付统一下单请求
         OpenEnum openType = OpenEnum.valueOf(paymentProperties.getOpenType());
@@ -627,7 +626,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         userOrderPayment.setPayFailMsg("");
         userOrderPayment.setCreateTime(new Date());
         userOrderPayment.setUpdateTime(new Date());
-        userOrderPaymentService.saveOrUpdate(userOrderPayment);
+
+        //查询订单下支付中的付款单，取消支付
+        userOrderPaymentService.closePayment(payment.getOrderNo(),  "用户发起了新的付款请求", null);
+
+        userOrderPaymentService.save(userOrderPayment);
     }
 
     @Override