Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java

@@ -15,6 +15,7 @@


import javax.annotation.Resource;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.multipart.MultipartFile;

@@ -39,6 +40,8 @@
import com.yeshi.fanli.entity.bus.user.UserRank;

import com.yeshi.fanli.entity.bus.user.UserRankRecord;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.notify.UserActivedRecord;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.exception.user.ThreeSaleException;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

@@ -51,6 +54,8 @@
import com.yeshi.fanli.service.inter.user.UserInviteRecordService;

import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.InviteCodeFilterUtil;

@@ -96,6 +101,13 @@
   @Resource

   private UserInviteRecordService userInviteRecordService;



   @Resource

   @Lazy

   private UserActivedRecordService userActivedRecordService;

	
   @Resource

   private UserAccountMsgNotificationService userAccountMsgNotificationService;



   @Resource(name = "producer")

   private Producer producer;



@@ -108,10 +120,10 @@
      }



      // 等级对照表

      String contrast = configService.get("user_rank_contrast");

      String contrast = configService.get(ConfigKeyEnum.userRankContrast.getKey());

      extraVO.setRankContrast(contrast);

      // 特别提醒

      String rankTip = configService.get("user_rank_tip");

      String rankTip = configService.get(ConfigKeyEnum.userRankTip.getKey());

      extraVO.setRankTip(rankTip);



      Integer rankOrderNum = extraVO.getRankOrderNum();

@@ -348,7 +360,7 @@
      inviteCode = inviteCode.toUpperCase();

      // 邀请码对应用户信息

      UserInfo inviter = userInfoService.getUserInfoByInviteCode(inviteCode);

      if (inviter == null)

      if (inviter == null || inviter.getState() != UserInfo.STATE_NORMAL)

         throw new UserInfoExtraException(1, "上级邀请码不存在");



      // 绑定关系

@@ -379,6 +391,7 @@
         userInfoExtra.setCreateTime(new Date());

         userInfoExtraMapper.insertSelective(userInfoExtra);

      }

      userActivedRecordService.add(new UserActivedRecord(uid));



      if (!Constant.IS_TEST) { // 发送激活成功消息

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,

@@ -448,8 +461,9 @@
            if (asInputStream == null) {

               LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

            } else {

               FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String.format(

                     FilePathEnum.userPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

               FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,

                     String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(),

                           System.currentTimeMillis() + ""));

               if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {

                  headimgurl = result.getUrl();

               } else {

@@ -469,6 +483,11 @@
      Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);

      if (inviterId == null)

         throw new UserInfoExtraException(1, "没有对应的邀请关系");

		
      UserInfo boss = userInfoService.selectByPKey(inviterId);

      if (boss == null || boss.getState() != UserInfo.STATE_NORMAL) {

         throw new UserInfoExtraException(1, "没有对应的邀请关系");

      }



      // 绑定关系

      try {

@@ -498,7 +517,9 @@
         userInfoExtra.setCreateTime(new Date());

         userInfoExtraMapper.insertSelective(userInfoExtra);

      }

      userActivedRecordService.add(new UserActivedRecord(uid));

      



      if (!Constant.IS_TEST) { // 发送激活成功消息

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,

               new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));

@@ -567,8 +588,9 @@
            if (asInputStream == null) {

               LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

            } else {

               FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String.format(

                     FilePathEnum.userPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

               FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,

                     String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(),

                           System.currentTimeMillis() + ""));

               if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {

                  headimgurl = result.getUrl();

               } else {

@@ -587,6 +609,11 @@
      // 邀请人ID -1.5.3新版

      Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);

      if (inviterId == null) {

         throw new UserInfoExtraException(1, "没有对应的邀请关系");

      }

		
      UserInfo boss = userInfoService.selectByPKey(inviterId);

      if (boss == null || boss.getState() != UserInfo.STATE_NORMAL) {

         throw new UserInfoExtraException(1, "没有对应的邀请关系");

      }



@@ -620,6 +647,8 @@
         userInfoExtraMapper.insertSelective(userInfoExtra);

      }

      

      userActivedRecordService.add(new UserActivedRecord(uid));



      if (!Constant.IS_TEST) { // 发送激活成功消息

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,

               new Gson().toJson(new InviteCodeActiveMQMsg(uid, new Date())));

@@ -767,6 +796,10 @@
      UserInfo inviter = userInfoService.getUserInfoByInviteCode(inviteCode);

      if (inviter == null)

         throw new UserInfoExtraException(1, "上级邀请码不存在");

		
      if (inviter.getState() != UserInfo.STATE_NORMAL) {

         throw new UserInfoExtraException(1, "上级邀请码不存在");

      }



      return inviter;

   }

@@ -813,6 +846,11 @@
      if (inviter == null) {

         throw new UserInfoExtraException(1, "对应的邀请关系不存在");

      }

		
      if (inviter.getState() != UserInfo.STATE_NORMAL) {

         throw new UserInfoExtraException(1, "对应的邀请关系不存在");

      }

		
      return inviter;

   }



@@ -821,7 +859,7 @@
      userInfoExtraMapper.updateAutoExtract(days);

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void updateInviteCodeVip(String inviteCodeVip, Long uid) throws UserInfoExtraException {

      if (inviteCodeVip == null || inviteCodeVip.length() < 4 || inviteCodeVip.length() > 12)

@@ -856,34 +894,37 @@
      update.setInviteCodeVip(inviteCodeVip);

      update.setUpdateTime(new Date());

      userInfoExtraMapper.updateByPrimaryKeySelective(update);

	   
      if(!Constant.IS_TEST) { //发送邀请码更改成功的消息



      if (!Constant.IS_TEST) { // 发送邀请码更改成功的消息

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userInfoUpdate,

               new Gson().toJson(new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip, new Date())));

               new Gson().toJson(new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip,

                     new Date())));

         producer.send(message);

      }

		
      // 消息

      userAccountMsgNotificationService.createChangeInviteCode(uid, extra.getInviteCode(), inviteCodeVip);

   }

	
	


   @Override

   public void uploadERCode(MultipartFile file, Long uid) {

      UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);

      if (extra == null)

         return;

		


      // 压缩

      String targetPath = FileUtil.getCacheDir() + "/erCode_" + uid + "_" + System.currentTimeMillis()+ ".jpg";

      String targetPath = FileUtil.getCacheDir() + "/erCode_" + uid + "_" + System.currentTimeMillis() + ".jpg";

      try {

         Thumbnails.of(file.getInputStream()).size(200, 200).toFile(targetPath);

      } catch (IOException e) {

         LogHelper.errorDetailInfo(e);

         return;

      }

		


      // 执行上传

      String filePath = FilePathEnum.userERcode.getPath() + UUID.randomUUID().toString().replace("-", "") + ".jpg";

      String fileLink = COSManager.getInstance().uploadFile(new File(targetPath), filePath).getUrl();

	


      // 删除本地图片

      if (new File(targetPath).exists()) {

         new File(targetPath).delete();

@@ -891,7 +932,7 @@


      // 原二维码

      String erCode = extra.getErCode();

		


      UserInfoExtra update = new UserInfoExtra();

      update.setId(extra.getId());

      update.setErCode(fileLink);

@@ -902,4 +943,5 @@
         COSManager.getInstance().deleteFile(erCode);

      }

   }



}