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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -39,6 +39,7 @@
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.system.ConfigKeyEnum;

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

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

import com.yeshi.fanli.log.LogHelper;

@@ -52,6 +53,7 @@
import com.yeshi.fanli.service.inter.user.UserRankService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.InviteCodeFilterUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

@@ -107,10 +109,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();

@@ -379,10 +381,11 @@
         userInfoExtraMapper.insertSelective(userInfoExtra);

      }



      // 发送激活成功消息

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

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

      producer.send(message);

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

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

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

         producer.send(message);

      }



      return mycode;

   }

@@ -447,7 +450,7 @@
               LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

            } else {

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

                     "/portrait/wx/%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

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

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

                  headimgurl = result.getUrl();

               } else {

@@ -496,10 +499,12 @@
         userInfoExtra.setCreateTime(new Date());

         userInfoExtraMapper.insertSelective(userInfoExtra);

      }

      // 发送激活成功消息

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

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

      producer.send(message);

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

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

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

         producer.send(message);

      }

   }



   @Override

@@ -564,7 +569,7 @@
               LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

            } else {

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

                     "/portrait/wx/%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

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

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

                  headimgurl = result.getUrl();

               } else {

@@ -614,6 +619,12 @@
      } else {

         userInfoExtra.setCreateTime(new Date());

         userInfoExtraMapper.insertSelective(userInfoExtra);

      }

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

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

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

         producer.send(message);

      }

   }



@@ -846,10 +857,12 @@
      update.setInviteCodeVip(inviteCodeVip);

      update.setUpdateTime(new Date());

      userInfoExtraMapper.updateByPrimaryKeySelective(update);

       //发送邀请码更改成功的消息

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

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

      producer.send(message);

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

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

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

         producer.send(message);

      }

   }

   

   

@@ -869,7 +882,7 @@
      }

      

      // 执行上传

      String filePath = "/img/user/erCode/" + UUID.randomUUID().toString().replace("-", "") + ".jpg";

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

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

   

      // 删除本地图片