Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserMemberExportDTO.java

@@ -24,6 +24,7 @@ public class BaseUserMemberExportDTO implements Serializable {
     private Integer id;
     private String username;
     private Integer memberLevel;
+    private String memberName;
     private Integer totalNumber;
     private Integer rentFreeDays;
     private Integer discount;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserMemberVO.java

@@ -74,4 +74,7 @@ public class BaseUserMemberVO implements Serializable {
     @Column(name = "name")
     private String name;
 
+    @Column(name = "member_name")
+    private  String memberName;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -65,6 +65,8 @@ public class UserMemberDTO  {
 	@Column(name = "valid_time")
 	@ApiModelProperty(value = "有效期;0代表永久")
 	private Long validTime;
-	
 
+	@Column(name = "member_name")
+	@ApiModelProperty("会员名")
+    private String memberName;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberSaveDTO.java

@@ -17,7 +17,7 @@ public class UserMemberSaveDTO {
     private String phone;
 
     @ApiModelProperty(value = "会员名")
-    private String username;
+    private String memberName;
 
     /**
      *  会员等级

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

@@ -138,4 +138,7 @@ public class BaseUserMember implements Serializable {
     @Column(name = "recent_recharge")
 	private Long recentRecharge;
 
+	@Column(name = "member_name")
+	private String memberName;
+
 }

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

@@ -40,5 +40,7 @@ public class BaseUserMemberExport  implements Serializable {
     private String crtName;
     @Column(name = "crt_id")
     private Integer crtId;
+    @Column(name = "member_name")
+    private String memberName;
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -80,6 +80,7 @@ public class AppUserDTO {
 	private Integer lockDays;
 	private Integer discount;
 	private Integer memberLevel;
+	private String memberName;
 	//图标
 	private String icon;
 	private Integer memberNo;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/UserMemberVo.java

@@ -109,6 +109,8 @@ public class UserMemberVo {
      */
 	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
     private Integer isDel;
-	
+
+	@ApiModelProperty("会员名")
+	private String memberName;
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -60,6 +60,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                 userMemberDTO.setDiscount(level == null ? 0 : (level.getDiscount() == null ? 0 : level.getDiscount()));
                 userMemberDTO.setTotalNumber(userMemberSaveDTO.getTotalNumber());
                 userMemberDTO.setRentFreeDays(userMemberSaveDTO.getRentFreeDays());
+                userMemberDTO.setMemberName(userMemberSaveDTO.getMemberName());
                 userMemberDTO.setIsBind(1);
                 try {
                     baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
@@ -104,8 +105,9 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
 
             String phone = data[0];
             String memberLevelName = data[1];
-            String totalNumber = data[2];
-            String rentFreeDays = data[3];
+            String memberName  = data[2];
+            String totalNumber = data[3];
+            String rentFreeDays = data[4];
 
             for (Map.Entry<String, Integer> entry : leaveNameAndLeaveEntry) {
                 if (entry.getKey().contains(memberLevelName.substring(0,1))){
@@ -123,6 +125,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                 userMemberDTO.setTotalNumber(Integer.valueOf(totalNumber));
                 userMemberDTO.setRentFreeDays(Integer.valueOf(rentFreeDays));
                 userMemberDTO.setIsBind(1);
+                userMemberDTO.setMemberName(memberName);
                 try {
                     baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
                 } catch (Exception e) {
@@ -140,6 +143,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .discount(discount)
                     .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(phone) == null ? 0 : 1))
                     .crtId(userId)
+                    .memberName(memberName)
                     .crtName(userName)
                     .crtTime(Instant.now().toEpochMilli())
                     .isDel(0)

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

@@ -19,6 +19,7 @@
         <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
+        <result property="memberName" column="member_name"/>
     </resultMap>
 
     <select id="getInfoByUserId" resultMap="baseUserMemberMap">
@@ -36,6 +37,7 @@
         m.total_number as totalNumber,
         m.buy_count as buyCount,
         m.valid_time as validTime,
+        m.member_name as `memberName`
         ml.name as name
         from
         base_user_member m