Merge remote-tracking branch 'origin/master'

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

@@ -721,12 +721,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
         refundReq.setReason("支付超时,全额退回");
         refundReq.setPaymentNo(userOrderPayment.getAdapayNo());
-        refundReq.setTradeNo(userOrderPayment.getTransNo());
+        refundReq.setTradeNo(data.getId());
         refundReq.setOrderAmt(userOrderPayment.getPayAmt());
         BaseResult<RefundBill> refundBillBaseResult = paymentClient.refundPayment(refundReq);
         userOrderRefund = new UserOrderRefund();
         userOrderRefund.setOrderNo(orderSn);
-        userOrderRefund.setPayTransNo(userOrderPayment.getTransNo());
+        userOrderRefund.setPayTransNo(data.getId());
         userOrderRefund.setRefundAmt(userOrderPayment.getPayAmt());
         userOrderRefund.setPayOrderNo(userOrderPayment.getOrderNo());
         if (refundBillBaseResult.getStatus()) {