支付回调修改

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

@@ -335,7 +335,39 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
                 }
             }
         }
-        return doOrderRefund(orderRefunds);
+
+        RefundBill refundBill = new RefundBill(orderPayment.getOpenType(),
+                PaymentClientEnum.valueOf(orderPayment.getPaymentClient()), orderPayment.getPayChannel());
+        refundBill.setTradeNo(data.getId());
+        refundBill.setPaymentNo(data.getPaymentNo());
+
+        //单号生成
+        Long billNo = idGeneratorService.generatorId("billNo");
+        refundBill.setRefundNo(billNo.toString());
+
+        refundBill.setOrderAmt(orderPayment.getPayAmt());
+        refundBill.setRefundAmt(orderPayment.getPayAmt());
+        refundBill.setReason(reason);
+
+        BaseResult<RefundBill> refundBillBaseResult = paymentClient.refundPayment(refundBill);
+        log.info("退款返回: {} ", JSONObject.toJSONString(refundBillBaseResult));
+
+        //入退款单表
+        UserOrderRefundBill orderRefundBill = new UserOrderRefundBill();
+        orderRefundBill.setRefundId(orderRefunds.getId());
+        orderRefundBill.setBillNo(billNo.toString());
+        orderRefundBill.setRefundAmt(orderRefunds.getActualAmount());
+        if (refundBillBaseResult.getStatus()) {
+            orderRefundBill.setTransNo(refundBillBaseResult.getData().getId());
+            orderRefundBill.setStatus(TradeStatusEnum.pending);
+        } else {
+            orderRefundBill.setStatus(TradeStatusEnum.failed);
+            orderRefundBill.setPayFailMsg(refundBillBaseResult.getMsg());
+        }
+
+        refundBillService.save(orderRefundBill);
+        updateById(orderRefunds);
+        return HttpResponseResult.succeed(orderRefundBill);
     }