Merge branch 'wallet_detail' into dev

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.util.StringUtils;
 
 /**
  * @author libin
@@ -43,4 +44,8 @@ public class UserMemberSaveDTO {
      */
     @ApiModelProperty(value = "剩余天数")
     private Integer source;
+
+    public String getPhone() {
+        return StringUtils.hasText(phone)?phone.trim():"";
+    }
 }

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

@@ -19,6 +19,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
@@ -88,6 +89,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .discount(level == null ? 0 : level.getDiscount() == null ? 0 : level.getDiscount())
                     .status(hasUsed?1:0)
                     .userId(hasUsed?phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()):null)
+                    .source(0)
                     .crtId(userId)
                     .crtName(name)
                     .crtTime(Instant.now().toEpochMilli())
@@ -153,6 +155,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                              Integer memberLevel, Integer discount, AtomicInteger counter,Map<Integer,UserMemberDTO> numAndUserMemberMap) {
         for (String[] data : userMemberData) {
             String phone = data[0];
+            phone = StringUtils.hasText(phone)?phone.trim():"";
             String memberLevelName = data[1];
             String memberName  = data[2];
             String totalNumber = data[3];
@@ -197,6 +200,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .userId(hasUsed?phoneAndUserIdMap.get(phone):null)
                     .crtId(userId)
                     .memberName(memberName)
+                    .source(0)
                     .crtName(userName)
                     .crtTime(Instant.now().toEpochMilli())
                     .verificationTime(hasUsed?Instant.now().toEpochMilli():null)