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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

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

@@ -45,6 +45,7 @@
import com.yeshi.fanli.entity.bus.user.InviteUser;

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

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

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

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

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

import com.yeshi.fanli.exception.ThreeSaleException;

@@ -60,6 +61,7 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -132,6 +134,10 @@


   @Resource

   private BindingAccountService bindingAccountService;

	
   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	


   public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {

      List<UserInfo> list = null;

@@ -971,7 +977,9 @@
      if (!StringUtil.isNullOrEmpty(portrait) && portrait.contains("/img/user/")) {

         COSManager.getInstance().deleteFile(portrait);

      }



		
      userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.portrait, fileLink);

		
      executor.execute(new Runnable() {

         @Override

         public void run() {