批量会员导入

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

@@ -9,7 +9,6 @@ import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -26,7 +25,6 @@ import tk.mybatis.spring.annotation.MapperScan;
 @SpringBootApplication
 @EnableFeignClients(value = {"com.github.wxiaoqi.security","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableScheduling
-@EnableAsync
 @EnableAceAuthClient
 @EnableAceCache
 @EnableTransactionManagement

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

@@ -7,7 +7,6 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +37,6 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
 
 
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
-    @Async
     public void importUserMember(List<String[]> userMemberData){
         List<BaseUserMemberExport> baseUserMemberExports = new ArrayList<>();
 
@@ -49,16 +47,18 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
 
         for (String[] data : userMemberData) {
 
-            String username = data[0];
+            String phone = data[0];
             String memberLevel = data[1];
             String totalNumber = data[2];
             String rentFreeDays = data[3];
 
-            if (phoneAndUserIdMap!=null && phoneAndUserIdMap.get(username)!=null){
+            if (phoneAndUserIdMap!=null && phoneAndUserIdMap.get(phone)!=null){
                 UserMemberDTO userMemberDTO = new UserMemberDTO();
-                userMemberDTO.setUserId(phoneAndUserIdMap.get(username));
-                userMemberDTO.setDiscount(levelAndDisCountMap==null?0:(levelAndDisCountMap.get(memberLevel)==null?0:levelAndDisCountMap.get(memberLevel)));
+                userMemberDTO.setUserId(phoneAndUserIdMap.get(phone));
+                userMemberDTO.setMemberLevel(Integer.valueOf(memberLevel));
+                userMemberDTO.setDiscount(levelAndDisCountMap==null?0:(levelAndDisCountMap.get(Integer.valueOf(memberLevel))==null?0:levelAndDisCountMap.get(Integer.valueOf(memberLevel))));
                 userMemberDTO.setTotalNumber(Integer.valueOf(totalNumber));
+                userMemberDTO.setRentFreeDays(Integer.valueOf(rentFreeDays));
                 try {
                     baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
                 } catch (Exception e) {
@@ -69,12 +69,17 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
 
             BaseUserMemberExport memberExport = BaseUserMemberExport
                     .builder()
-                    .username(username)
+                    .username(phone)
                     .memberLevel(Integer.valueOf(memberLevel))
                     .totalNumber(Integer.valueOf(totalNumber))
                     .rentFreeDays(Integer.valueOf(rentFreeDays))
-                    .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(username) == null ? 0 : 1))
+                    .discount(levelAndDisCountMap==null?0:(levelAndDisCountMap.get(Integer.valueOf(memberLevel))==null?0:levelAndDisCountMap.get(Integer.valueOf(memberLevel))))
+                    .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(phone) == null ? 0 : 1))
+                    .isDel(0)
                     .build();
+             if (log.isDebugEnabled()){
+                 log.debug("当前组装的数据：【{}】",memberExport);
+             }
             baseUserMemberExports.add(memberExport);
         }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberExportMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
-import tk.mybatis.mapper.additional.insert.InsertListMapper;
 import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.special.InsertListMapper;
+
 /**
  * @author libin
  * @version 1.0

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserMemberController.java

@@ -62,11 +62,17 @@ public class UserMemberController {
     }
 
     @PostMapping("/user/export")
-    public ObjectRestResponse importUserMember(@RequestPart("file") MultipartFile userMemberExcel) {
+    public ObjectRestResponse importUserMember(MultipartFile userMemberExcel) {
         List<String[]> userMemberData = ExcelImport.getExcelData(userMemberExcel);
         if (userMemberData.size() < 1) {
             return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
         }
+        for (String[] userMemberDatum : userMemberData) {
+            if (userMemberDatum.length!=4){
+                return ObjectRestResponse.createFailedResult(1002, "数据不完整！！！");
+            }
+        }
+        userMemberData.remove(0);
         baseUserMemberExportBiz.importUserMember(userMemberData);
         return  ObjectRestResponse.succ();
     }