Merge branch 'master' into master-zjw

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

@@ -43,4 +43,7 @@ public class WalletCathListDTO {
 
     @ApiModelProperty("单号")
     private String cono;
+
+    @ApiModelProperty(value = "用户账号")
+    private String accountNumber;
 }

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

@@ -40,4 +40,7 @@ public class WalletCathAdminVo {
     @ApiModelProperty("单号")
     private String cono;
 
+    @ApiModelProperty(value = "用户账号")
+    private String accountNumber;
+
 }

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

@@ -84,6 +84,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .memberLevel(userMemberSaveDTO.getMemberLevel())
                     .totalNumber(userMemberSaveDTO.getTotalNumber())
                     .rentFreeDays(userMemberSaveDTO.getRentFreeDays())
+                    .memberName(userMemberSaveDTO.getMemberName())
                     .discount(level == null ? 0 : level.getDiscount() == null ? 0 : level.getDiscount())
                     .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? 0 : 1))
                     .crtId(userId)
@@ -113,12 +114,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 +130,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 +170,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

@@ -30,6 +30,7 @@ import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.im.feign.ImFeign;
 import com.xxfc.platform.universal.dto.RegionDTO;
+import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.RegionFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -37,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -105,6 +107,9 @@ public class AppPermissionService {
     @Autowired
     private BaseUserMemberBiz baseUserMemberBiz;
 
+    @Value("${admin.smallName}")
+    private  String  smallName;
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -447,8 +452,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;
+        }
+
     }
 
     /**
@@ -949,7 +960,15 @@ public class AppPermissionService {
             //上线绑定
             relationBiz.bindByUserId(userid, small_id);
             //发送短信通知用户
-            thirdFeign.sendCode(username, password, SystemConfig.TEMPLATECODE);
+            List<String> smsParams = new ArrayList<String>();
+            smsParams.add(smallName);
+            smsParams.add(username);
+            smsParams.add(password);
+            thirdFeign.sendTemplate(new SmsTemplateDTO(){{
+                setPhoneNumbers(username);
+                setType(SmsTemplateDTO.PWD);
+                setParams(smsParams.toArray(new String[smsParams.size()]));
+            }});
            //参加新人活动
             jionActivity(userid);
             // 登录结果要做做统一处理

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

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

@@ -14,7 +14,8 @@
         wc.stauts,
         wc.crt_time AS `crtTime`,
         wc.finish_time AS `finishTime`,
-        wc.cono
+        wc.cono,
+        wc.account_number AS `accountNumber`
         FROM
         (SELECT * FROM `my_wallet_cath` <if test="state != null">
         WHERE `stauts`=#{state}

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -127,6 +127,9 @@
                 </foreach>
 
             </if>
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
             <if test="status != null">
                 and b.status = #{status}
             </if>

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -71,6 +71,8 @@ public class SmsTemplateDTO {
     public static final int PAY_I= 26;
     //旅游（上车通知）27
     public static final int PAY_J= 27;
+    //小程序密码通知
+    public static final int PWD= 28;
 
 
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java

@@ -82,6 +82,9 @@ public class AliYunSmsBiz {
     //旅游（上车通知）27
     public static final String TEMPLATE_ID_PAY_J= "SMS_173345606";
 
+    //旅游（上车通知）27
+    public static final String PWD= "SMS_174990497";
+
 
 
     //发送模板消息
@@ -166,6 +169,9 @@ public class AliYunSmsBiz {
              case 27 :
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_J);
                  break;
+             case 28 :
+                 SmsService.sendTemplateToJson(phoneNumbers,params,PWD);
+                 break;
 
          }