Merge branch 'feature/1.9.34-预支付失败记录消息到reason-肖家炜' into develop

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2225,7 +2225,7 @@ public class OrderServiceImpl implements Orderservice {
         if(!notCancelOrderClientList.contains(orderClient)) {
             //失败冲正库存，冲正活动库存，取消订单
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, StringUtils.defaultIfBlank(msg,"获取预支付失败"), trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, StringUtils.join(new String[]{"获取预支付失败", msg}, '-'), trackingNo, null);
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             // TODO: 2019/9/10 hubowen mq推送变更
             backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());