修复短信发送bug

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

@@ -14,7 +14,6 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
 import com.xxfc.platform.order.entity.*;
-import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -297,6 +296,9 @@ public class OrderMsgBiz {
                             }else {
                                 smstype = SmsTemplateDTO.CANCEL_A;
                             }
+
+                            //发送用户取消消息
+                            sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
                         }else {
                             //使用免费天数
                             if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
@@ -304,14 +306,13 @@ public class OrderMsgBiz {
                             }else {
                                 smstype = SmsTemplateDTO.CANCEL_C;
                             }
+
+                            //发送用户退款消息
+                            smsParams.clear();
+                            sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
                         }
 
-                        //发送用户取消消息
-                        sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
 
-                        //发送用户退款消息
-                        smsParams.clear();
-                        sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();
@@ -509,6 +510,13 @@ public class OrderMsgBiz {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 break;
+            case SmsTemplateDTO.CANCEL_B :
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
+                    smsParams.add(USER_M+ appUserDTO.getRealname());
+                }else {
+                    smsParams.add(USER_N+ appUserDTO.getRealname());
+                }
+                break;
             case SmsTemplateDTO.PAY_I :
                 if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());