Merge branch 'master' into feature-zjw

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

@@ -4,6 +4,8 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -43,6 +45,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     @Autowired
     AppUserDetailBiz detailBiz;
 
+    @Autowired
+    private BaseUserMemberLevelMapper BaseUserMemberLevelMapper;
+
 //    @Autowired
 //    private TaskExecutor taskExecutor;
 //
@@ -213,7 +218,6 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     }
 
 
-
     /**
      * 设置用户会员
      *
@@ -230,7 +234,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         if (totalNumber < freeDays) {
             freeDays = totalNumber;
         }
-        Integer buyCount = userMemberDTO.getBuyCount() == null ? 1:userMemberDTO.getBuyCount() ;
+
+        if (userMemberDTO.getMemberLevel() != null) {
+            Example exa = new Example(BaseUserMemberLevel.class);
+            Example.Criteria criteria = exa.createCriteria();
+            criteria.andEqualTo("isdel", 0);
+            criteria.andEqualTo("level",userMemberDTO.getMemberLevel());
+            List<BaseUserMemberLevel> levels = BaseUserMemberLevelMapper.selectByExample(exa);
+            if (CollectionUtils.isEmpty(levels)) {
+                log.error("错误!设置的该等级会员不存在.");
+                throw new BaseException("错误!设置的该等级会员不存在。");
+            }else if (levels.size()>1){
+                log.error("错误!该等级的会员存在多个。");
+                throw new BaseException("错误!该等级的会员存在多个。");
+            }else {
+                baseUserMember.setDiscount(levels.get(0).getDiscount());
+            }
+        }
+
+        Integer buyCount = userMemberDTO.getBuyCount() == null ? 1 : userMemberDTO.getBuyCount();
         UserMemberVo userMemberVo = getMemberInfoByUserId(userMemberDTO.getUserId());
         if (userMemberVo == null) {
             baseUserMember.setRentFreeDays(freeDays);
@@ -241,8 +263,8 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             Integer number = userMemberVo.getTotalNumber() == null ? 0 : userMemberVo.getTotalNumber();
             Integer days = userMemberVo.getRentFreeDays() == null ? 0 : userMemberVo.getRentFreeDays();
             baseUserMember.setBuyCount(userMemberVo.getBuyCount() + buyCount);
-            number=(totalNumber-number)+number;
-            days=(freeDays-days)+days;
+            number = (totalNumber - number) + number;
+            days = (freeDays - days) + days;
             baseUserMember.setTotalNumber(number);
             baseUserMember.setRentFreeDays(days);
             getMyBiz().updateSelectiveById(baseUserMember);
@@ -255,14 +277,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             userVo1.setIsMember(1);
             detailBiz.updUuserInfoById(userVo1);
         }
-
     }
 
 
     public void deleteByUserIds(Collection<Integer> userIds) {
         Example example = new Example(BaseUserMember.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("userId",userIds);
+        criteria.andIn("userId", userIds);
         mapper.deleteByExample(example);
     }
 }
\ No newline at end of file

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

@@ -113,12 +113,13 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
         AtomicInteger counter = new AtomicInteger(0);
         int threadNums= userMemberData.size()/BORDER_NUM==0?1:userMemberData.size()/BORDER_NUM;
         CountDownLatch latch = new CountDownLatch(threadNums);
+        Map<Integer,UserMemberDTO> numAndUserMemberMap = new HashMap<>(userMemberData.size());
         for (int i=0;i<threadNums;i++){
             int startIndex = i*BORDER_NUM;
             int endIndex=i==(threadNums-1)?userMemberData.size():(i+1)*BORDER_NUM;
             List<String[]> subResultDate = userMemberData.subList(startIndex,endIndex);
             threadPoolTaskExecutor.execute(()->{
-                wrapperData(subResultDate, userId, userName, baseUserMemberExports, levelAndbaseUserMemberMap, phoneAndUserIdMap, leaveNameAndLeaveEntry, memberLevel, discount, counter);
+                wrapperData(subResultDate, userId, userName, baseUserMemberExports, levelAndbaseUserMemberMap, phoneAndUserIdMap, leaveNameAndLeaveEntry, memberLevel, discount, counter, numAndUserMemberMap);
                  latch.countDown();
                 });
          }
@@ -128,12 +129,22 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
             throw new BaseException("导入数据失败");
         }
         InsertBatch(baseUserMemberExports);
+
+        Set<Map.Entry<Integer, UserMemberDTO>> entries = numAndUserMemberMap.entrySet();
+        for (Map.Entry<Integer, UserMemberDTO> memberDTOEntry : entries) {
+            try {
+                baseUserMemberBiz.updUserMemberByUserId(memberDTOEntry.getValue());
+            }catch (Exception ex){
+                log.error("当前行数：【{}】",memberDTOEntry.getKey());
+                log.error("会员更新错误：【{}】", ex.getMessage());
+                throw new BaseException("");
+            }
+        }
         return baseUserMemberExports.size();
     }
 
-    private void wrapperData(List<String[]> userMemberData, Integer userId, String userName, List<BaseUserMemberExport> baseUserMemberExports, Map<Integer, BaseUserMemberLevel> levelAndbaseUserMemberMap, Map<String, Integer> phoneAndUserIdMap, Set<Map.Entry<String, Integer>> leaveNameAndLeaveEntry, Integer memberLevel, Integer discount, AtomicInteger counter) {
+    private void wrapperData(List<String[]> userMemberData, Integer userId, String userName, List<BaseUserMemberExport> baseUserMemberExports, Map<Integer, BaseUserMemberLevel> levelAndbaseUserMemberMap, Map<String, Integer> phoneAndUserIdMap, Set<Map.Entry<String, Integer>> leaveNameAndLeaveEntry, Integer memberLevel, Integer discount, AtomicInteger counter,Map<Integer,UserMemberDTO> numAndUserMemberMap) {
         for (String[] data : userMemberData) {
-            counter.incrementAndGet();
             String phone = data[0];
             String memberLevelName = data[1];
             String memberName  = data[2];
@@ -158,15 +169,15 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                 userMemberDTO.setIsBind(1);
                 userMemberDTO.setMemberName(memberName);
                 userMemberDTO.setBuyCount(0);
-                try {
+                numAndUserMemberMap.put(counter.incrementAndGet(),userMemberDTO);
+               /* try {
                     baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
                 } catch (Exception e) {
                     log.error("当前行数：【{}】",counter.get());
                     log.error("会员更新错误：【{}】", e.getMessage());
                     throw new BaseException(e);
+                }*/
             }
-            }
-
             BaseUserMemberExport memberExport = BaseUserMemberExport
                     .builder()
                     .username(phone.trim())

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
  * @email nishijjo@qq.com
  * @date 2019-06-11 11:06:45
  */
+@Repository
 public interface BaseUserMemberLevelMapper extends Mapper<BaseUserMemberLevel> {
 
     List<BaseUserMemberLevel> selectUserMembersLevelByLevels(@Param("levels") List<Integer> levels);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -447,8 +447,14 @@ public class AppPermissionService {
     }
 
     public static String getIp() {
+        try {
             ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
             return requestAttributes.getRequest().getHeader("userHost");
+        }catch (Exception e){
+            e.printStackTrace();
+            return  null;
+        }
+
     }
 
     /**

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

@@ -113,6 +113,8 @@
         base_user_member_level ml
         on
         ml.level = b.member_level
+        where
+        ml.isdel=0
         ) m
         on
         l.id = m.user_id