Merge branch 'master-bacground-im' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderRefundBiz.java

@@ -98,9 +98,25 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
             //预授权转支付
             if(orderRefundVo.getFreeze2PayAmount() != 0) {
                 log.info("======支付宝预授权支付退款中===========");
-                flag = payBiz.tradePay(out_refund_no,
+                String refundTradeNo = Snowflake.build() + "";
+                boolean isComplete = payBiz.tradePay(refundTradeNo,
                         orderPay.getSerialNumber(), orderRefundVo.getFreeze2PayAmount(),
                         orderRefundVo.getFreeze2PayDesc(), orderRefundVo.getFreeze2PayDesc());
+                if (isComplete) {
+                    OrderRefund orderRefund = new OrderRefund();
+                    BeanUtils.copyProperties(orderRefund, orderRefundVo);
+                    if (StringUtils.isNotBlank(orderRefund.getRefundDesc())) {
+                        orderRefund.setRefundDesc(refundDesc);
+                    }
+                    orderRefund.setUserId(orderPay.getUserId());
+                    orderRefund.setStatus(2);
+                    orderRefund.setFinishTime(System.currentTimeMillis());
+                    orderRefund.setRefundTradeNo(refundTradeNo);
+                    orderRefund.setOutRefundNo(out_trade_no);
+                    orderRefund.setSerialNumber(orderPay.getSerialNumber());
+                    insertSelective(orderRefund);
+                    return JsonResultUtil.createSuccessResultWithObj(refundTradeNo);
+                }
             }
         } else if(orderPay.getPayWay() == 1){
             log.info("======微信退款中===========");