Merge branch 'master-zjw'

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -289,6 +289,15 @@ public class OrderCancelBiz {
 
                     //站点总人数减少
                     tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
+
+                    //已付款的取消订单发送消息
+                    try {
+                        AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+                        //处理后台用户提醒短信的发送
+                        orderMsgBiz.handelMsgCancel(orvd, otd, omd, baseOrder, appUserDTO);
+                    }catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    }
                 }
             }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java

@@ -326,7 +326,7 @@ public class OrderMsgBiz {
                     //后台发送消息(客服)
                     Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
                     smsParams.clear();
-                    sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
+                    sms2BgUser(cofig.getValue(), startCompanyDetailTour, null, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_F, smsParams);
                     break;
                 case MEMBER:
                     break;
@@ -577,10 +577,14 @@ public class OrderMsgBiz {
                 smsParams.add(startCompanyDetail.getAddrDetail());
                 break;
             case SmsTemplateDTO.PAY_J :
+                String realName = appUserDTO.getRealname();
+                if(StrUtil.isBlank(realName)){
+                    realName = "";
+                }
                 if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
-                    smsParams.add(USER_M+ appUserDTO.getRealname());
+                    smsParams.add(USER_M+ realName);
                 }else {
-                    smsParams.add(USER_N+ appUserDTO.getRealname());
+                    smsParams.add(USER_N+ realName);
                 }
                 smsParams.add(baseOrder.getName());
                 smsParams.add(HOUR_MINUTE_FORMATTE_HUTOOL.format(DateUtil.date(otd.getStartTime())));
@@ -684,7 +688,11 @@ public class OrderMsgBiz {
                 smsParams.add(orvd.getDayNum().toString());
                 break;
             case SmsTemplateDTO.PAY_H :
-                smsParams.add(appUserDTO.getRealname());
+                String realName = appUserDTO.getRealname();
+                if(StrUtil.isBlank(realName)){
+                    realName = "匿名";
+                }
+                smsParams.add(realName);
                 smsParams.add(appUserDTO.getUsername());
                 smsParams.add(baseOrder.getName());
                 smsParams.add(sCompany.getName());
@@ -692,7 +700,11 @@ public class OrderMsgBiz {
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
                 break;
             case SmsTemplateDTO.CANCEL_F :
-                smsParams.add(appUserDTO.getRealname());
+                String realName2 = appUserDTO.getRealname();
+                if(StrUtil.isBlank(realName2)){
+                    realName2 = "匿名";
+                }
+                smsParams.add(realName2);
                 smsParams.add(appUserDTO.getUsername());
                 smsParams.add(baseOrder.getName());
                 smsParams.add(sCompany.getName());