Merge branch 'master-tiande' into dev-tiande

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

@@ -3,17 +3,15 @@ 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;
 
 
 /**
  * 会员等级表
- * 
+ *
  * @author zjw
  * @email nishijjo@qq.com
  * @date 2019-06-11 11:06:45
@@ -22,57 +20,78 @@ import java.math.BigDecimal;
 @Table(name = "base_user_member_level")
 public class BaseUserMemberLevel implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
-	    //主键id
-    @Id
+
+	//主键id
+	@Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("主键id")
-    private Integer id;
-	
-	    //等级名称
-    @Column(name = "name")
+	private Integer id;
+
+	//等级名称
+	@Column(name = "name")
 	@ApiModelProperty(value = "等级名称")
-    private String name;
-	
-	    //图标
-    @Column(name = "icon")
+	private String name;
+
+	//图标
+	@Column(name = "icon")
 	@ApiModelProperty(value = "图标")
-    private String icon;
-	
-	    //等级
-    @Column(name = "level")
+	private String icon;
+
+	//等级
+	@Column(name = "level")
 	@ApiModelProperty(value = "等级")
-    private Integer level;
-	
-	    //描述
-    @Column(name = "describes")
+	private Integer level;
+
+
+
+	@Column(name = "extract")
+	@ApiModelProperty(value = "提成比例")
+	private Integer extract;
+
+	//描述
+	@Column(name = "describes")
 	@ApiModelProperty(value = "描述")
-    private String describe;
+	private String describe;
 
 	//权益
 	@Column(name = "rights")
 	@ApiModelProperty(value = "权益")
 	private String rights;
-	
-	    //有效数；-1是永久有效
-    @Column(name = "end_date")
+
+	//有效数；-1是永久有效
+	@Column(name = "end_date")
 	@ApiModelProperty(value = "有效数；-1是永久有效")
-    private Integer endDate;
-	
-	    //折扣
-    @Column(name = "discount")
+	private Integer endDate;
+
+	//折扣
+	@Column(name = "discount")
 	@ApiModelProperty(value = "折扣")
-    private Integer discount;
-	
-	    //是否删除；0-正常；1-删除
-    @Column(name = "isdel")
+	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-删除")
-    private Integer isdel;
-	
-	    //购买会员价格
-    @Column(name = "price")
+	private Integer isdel;
+
+	//购买会员价格
+	@Column(name = "price")
 	@ApiModelProperty(value = "购买会员价格")
-    private BigDecimal price;
+	private BigDecimal price;
 
 	//赠送免费天数
 	@Column(name = "number")
@@ -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();