Skip to content

C
cloud-platform
Commit bea2486a authored by jiaorz's avatar jiaorz
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 1ba321ba ba77b3ac
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 33 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
View file @ bea2486a
package com.github.wxiaoqi.security.admin.feign.dto;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -102,4 +103,20 @@ public class AppUserDTO {
private Integer parentPositionTempId;
//用户分公司id
private Integer parentCompanyId;
public String obtainRealname() {
if(StrUtil.isBlank(getRealname())) {
return "匿名";
}else {
return getRealname();
}
}
public String obtainRealnameNUL() {
if(StrUtil.isBlank(getRealname())) {
return "";
}else {
return getRealname();
}
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
View file @ bea2486a
......@@ -505,13 +505,13 @@ public class OrderMsgBiz {
private void handelSmsParam(OrderRentVehicleDetail orvd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int handelType) {
if(RENT_DELIVERY == handelType) {
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
smsParams.add(orvd.getEndAddr());
smsParams.add(baseOrder.getName());
smsParams.add(appUserDTO.getUsername());
}else {
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(baseOrder.getName());
smsParams.add(orvd.getStartAddr());
smsParams.add(orvd.getEndAddr());
......@@ -526,16 +526,16 @@ public class OrderMsgBiz {
switch (paramHandelType) {
case SmsTemplateDTO.PAY_A :
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
smsParams.add(baseOrder.getRealAmount().toString());
smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
smsParams.add(startCompanyDetail.detailAddr());
break;
case SmsTemplateDTO.PAY_B :
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(orvd.getFreeDays().toString());
smsParams.add(appUserDTO.getRentFreeDays().toString());
smsParams.add(baseOrder.getRealAmount().toString());
......@@ -556,31 +556,28 @@ public class OrderMsgBiz {
break;
case SmsTemplateDTO.CANCEL_A :
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
break;
case SmsTemplateDTO.CANCEL_B :
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
break;
case SmsTemplateDTO.PAY_I :
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
smsParams.add(startCompanyDetail.getAddrDetail());
break;
case SmsTemplateDTO.PAY_J :
String realName = appUserDTO.getRealname();
if(StrUtil.isBlank(realName)){
realName = "";
}
String realName = appUserDTO.obtainRealnameNUL();
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ realName);
}else {
......@@ -599,9 +596,9 @@ public class OrderMsgBiz {
switch (paramHandelType) {
case SmsTemplateDTO.CANCEL_C :
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
smsParams.add(violateAmount.toString());
smsParams.add(refundAmount.toString());
......@@ -614,9 +611,9 @@ public class OrderMsgBiz {
Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
Long rentDepositAutoRefundTime = new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
smsParams.add(baseOrder.getNo());
smsParams.add(originalAmount.toString());
......@@ -627,9 +624,9 @@ public class OrderMsgBiz {
break;
case SmsTemplateDTO.REFUND_B:
if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
smsParams.add(USER_M+ appUserDTO.getRealname());
smsParams.add(USER_M+ appUserDTO.obtainRealnameNUL());
}else {
smsParams.add(USER_N+ appUserDTO.getRealname());
smsParams.add(USER_N+ appUserDTO.obtainRealnameNUL());
}
smsParams.add(baseOrder.getNo());
smsParams.add(originalAmount.toString());
......@@ -649,7 +646,7 @@ public class OrderMsgBiz {
}
switch (paramHandelType) {
case SmsTemplateDTO.PAY_C :
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(appUserDTO.getUsername());
smsParams.add(baseOrder.getName());
smsParams.add(sCompany.getName());
......@@ -661,7 +658,7 @@ public class OrderMsgBiz {
smsParams.add(orvd.getDayNum().toString());
break;
case SmsTemplateDTO.PAY_D :
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(appUserDTO.getUsername());
smsParams.add(baseOrder.getName());
smsParams.add(sCompany.getName());
......@@ -671,14 +668,14 @@ public class OrderMsgBiz {
smsParams.add(orvd.getDayNum().toString());
break;
case SmsTemplateDTO.PAY_E :
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(appUserDTO.getUsername());
smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
smsParams.add(eCompany.getName());
smsParams.add(baseOrder.getName());
break;
case SmsTemplateDTO.CANCEL_E :
smsParams.add(appUserDTO.getRealname());
smsParams.add(appUserDTO.obtainRealname());
smsParams.add(appUserDTO.getUsername());
smsParams.add(baseOrder.getName());
smsParams.add(sCompany.getName());
......@@ -688,10 +685,7 @@ public class OrderMsgBiz {
smsParams.add(orvd.getDayNum().toString());
break;
case SmsTemplateDTO.PAY_H :
String realName = appUserDTO.getRealname();
if(StrUtil.isBlank(realName)){
realName = "匿名";
}
String realName = appUserDTO.obtainRealname();
smsParams.add(realName);
smsParams.add(appUserDTO.getUsername());
smsParams.add(baseOrder.getName());
......@@ -700,10 +694,7 @@ public class OrderMsgBiz {
smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
break;
case SmsTemplateDTO.CANCEL_F :
String realName2 = appUserDTO.getRealname();
if(StrUtil.isBlank(realName2)){
realName2 = "匿名";
}
String realName2 = appUserDTO.obtainRealname();
smsParams.add(realName2);
smsParams.add(appUserDTO.getUsername());
smsParams.add(baseOrder.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment