Merge branch 'master-bacground-im' into dev

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

@@ -97,7 +97,7 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
             }
             //预授权转支付
             if(orderRefundVo.getFreeze2PayAmount() != 0) {
-                log.info("======支付宝预授权支付退款中===========");
+                log.info("======预授权转支付===========");
                 String refundTradeNo = Snowflake.build() + "";
                 boolean isComplete = payBiz.tradePay(refundTradeNo,
                         orderPay.getSerialNumber(), orderRefundVo.getFreeze2PayAmount(),
@@ -115,7 +115,6 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
                     orderRefund.setOutRefundNo(out_trade_no);
                     orderRefund.setSerialNumber(orderPay.getSerialNumber());
                     insertSelective(orderRefund);
-                    return JsonResultUtil.createSuccessResultWithObj(refundTradeNo);
                 }
             }
         } else if(orderPay.getPayWay() == 1){