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

admin

2020-05-14 235921d820f29b04b1e82f6a6f0d4a1957a900ef

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -107,6 +107,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

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

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

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

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

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

@@ -253,6 +254,11 @@


   @Resource

   private UserInviteService userInviteService;

	
   @Resource

   private TeamFansInfoService teamFansInfoService;



	


   private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();

   private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();

@@ -1878,21 +1884,33 @@
    */

   @RequestMapping(value = "setextrainfo", method = RequestMethod.POST)

   public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {

      List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);

      if (listThreeSale == null || listThreeSale.size() == 0) {

      ThreeSale threeSale = threeSaleSerivce.selectByPrimaryKey(inviteId);

      if (threeSale == null) {

         out.print(JsonUtil.loadFalseResult("该记录不存在"));

         return;

      }



      UserInfo worker = listThreeSale.get(0).getWorker();

      UserInfo worker = threeSale.getWorker();

      if (worker == null) {

         out.print(JsonUtil.loadFalseResult("该记录不存在"));

         return;

      }



		
      int type = 1;

      if (threeSale.getBoss().getId() != uid) {

         type = 2;

      }

		
      ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());

      if (extraInfo == null) {

         extraInfo = new ThreeSaleExtraInfo();

         Long bossUid = threeSale.getBoss().getId();

         if (uid == bossUid) {

            extraInfo.setType(1); // 直接

         } else {

            extraInfo.setType(2); // 间接

         }

			
         extraInfo.setWorker(worker);

         extraInfo.setNickname(memoName);

         extraInfo.setCreateTime(new Date());

@@ -1906,6 +1924,10 @@
         updateInfo.setUpdateTime(new Date());

         threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(updateInfo);

      }

		
      // 更新粉丝记录信息

      teamFansInfoService.updateMemoName(worker.getId(), type, memoName);

		
      out.print(JsonUtil.loadTrueResult("保存成功"));

   }



@@ -2224,7 +2246,7 @@
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("获取失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }