Merge branch 'master-bacground-im' into dev

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

@@ -105,9 +105,12 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper, OrderRefund> {
                 if (isComplete) {
                     OrderRefund orderRefund = new OrderRefund();
                     BeanUtils.copyProperties(orderRefund, orderRefundVo);
-                    if (StringUtils.isNotBlank(orderRefund.getRefundDesc())) {
-                        orderRefund.setRefundDesc(refundDesc);
-                    }
+                    if (StringUtils.isNotBlank(orderRefundVo.getFreeze2PayDesc())) {
+                        orderRefund.setRefundDesc("预授权转支付：" + orderRefundVo.getFreeze2PayDesc());
+                    } else {
+						orderRefund.setRefundDesc("预授权转支付");
+					}
+                    orderRefund.setAmount(orderRefundVo.getFreeze2PayAmount());
                     orderRefund.setUserId(orderPay.getUserId());
                     orderRefund.setStatus(2);
                     orderRefund.setFinishTime(System.currentTimeMillis());