Merge branch 'master-tiande' into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

@@ -3,12 +3,10 @@ package com.github.wxiaoqi.security.admin.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 
 /**
@@ -44,6 +42,12 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "等级")
 	private Integer level;
 
+
+
+	@Column(name = "extract")
+	@ApiModelProperty(value = "提成比例")
+	private Integer extract;
+
 	//描述
 	@Column(name = "describes")
 	@ApiModelProperty(value = "描述")
@@ -64,6 +68,21 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "折扣")
 	private Integer discount;
 
+
+	@Column(name = "share_amount")
+	@ApiModelProperty(value = "分红金额")
+	private BigDecimal shareAmount;
+
+
+	@Column(name = "is_share")
+	@ApiModelProperty(value = "是否分红：0-否；1-是")
+	private Integer isShare;
+
+
+	@Column(name = "is_show")
+	@ApiModelProperty(value = "是否显示：0-不显示；1-显示")
+	private Integer isShow;
+
 	//是否删除；0-正常；1-删除
 	@Column(name = "isdel")
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
@@ -93,4 +112,8 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "会员商品图片")
 	private String itemImg;
 
+
+	@Transient
+	private BigDecimal showShareAmount;
+
 }

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

@@ -229,7 +229,11 @@ public class OrderMsgBiz {
                         //后台发送消息(客服)
                         Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
                         smsParams.clear();
-                        sms2BgUser(cofig.getValue(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
+                        String phoneValue = cofig.getValue();
+                        if (phoneValue != null) {
+                            phoneValue = phoneValue.replaceAll("<p>", "").replace("</p>","");
+                        }
+                        sms2BgUser(phoneValue, startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();