队员备注优化

喻健

2018-11-23 73ee2894e90f6ce51e185323a9c8304586977845

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

@@ -50,6 +50,7 @@
import com.yeshi.fanli.entity.bus.user.PassWordErrorRecord;

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

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

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

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

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

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

@@ -65,6 +66,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

@@ -132,6 +134,9 @@


   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

	
   @Resource

   private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;



   @Resource

   private LostOrderService lostOrderService;

@@ -716,6 +721,7 @@


      data.put("minMoney", minMoney);

      data.put("maxMoney", maxMoney);

      data.put("maxDayCount", maxDayCount);

      data.put("bindingAccountList", gson.toJson(filterBindingAccount(bindingAccountList)));



      JSONObject alipayVerify = new JSONObject();

@@ -1591,7 +1597,7 @@
    * @param id

    * @param out

    */

   @RequestMapping(value = "getMyTeam")

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

   public void getMyTeam(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {

      

      int pageSize = Constant.PAGE_SIZE;

@@ -1601,23 +1607,7 @@
         resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);

      } else if (type == 2) {

         resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);

      } else if (type == 3) {

			
         ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

         if (threeSale != null) {

				
            UserInfo boss = threeSale.getBoss();

            if (boss != null) {

               resultData.put("nickName", boss.getNickName());

               resultData.put("portrait", boss.getPortrait());

            }

				
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

            Long createTime = threeSale.getCreateTime();

            Date inviteTime = new Date(createTime);

            resultData.put("inviteTime", "邀请时间:" + sdf.format(inviteTime));

         }

      }

      } 
      

      out.print(JsonUtil.loadTrueResult(resultData));

   }

@@ -1628,7 +1618,7 @@
    * @param id

    * @param out

    */

   @RequestMapping(value = "countMyTeam")

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

   public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {

      

      long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);

@@ -1637,14 +1627,109 @@
      long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);

      long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);

      

      JSONObject bossData = new JSONObject();

      ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

      if (threeSale != null) {

			
         UserInfo boss = threeSale.getBoss();

         if (boss != null) {

            bossData.put("nickName", boss.getNickName());

            bossData.put("portrait", boss.getPortrait());

         }

			
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

         Long createTime = threeSale.getCreateTime();

         Date inviteTime = new Date(createTime);

         bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));

      }

		
		
      JSONObject resultData = new JSONObject();

      

      resultData.put("firstTeam", firstTeam);

      resultData.put("firstTeamTotal", firstTeamTotal);

      resultData.put("secondTeam", secondTeam);

      resultData.put("secondTeamTotal", secondTeamTotal);

      resultData.put("boss", bossData);

      

      out.print(JsonUtil.loadTrueResult(resultData));

   }

   

   /**

    * 用户队员信息保存 1.4.1

    * @param acceptData

    * @param uid

    * @param inviteId 邀请id

    * @param nickname

    * @param out

    */

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

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

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

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

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

         return;

      }

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

      if (worker == null) {

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

         return;

      }

		
      List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());

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

			
         ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();

         extraInfo.setWorker(worker);

         extraInfo.setNickname(nickname);

         extraInfo.setCreateTime(new Date());

         extraInfo.setUpdateTime(new Date());

			
         UserInfo boss = new UserInfo(uid);

         extraInfo.setBoss(boss);

			
         threeSaleExtraInfoSerivce.insert(extraInfo);

			
      } else {

         ThreeSaleExtraInfo extraInfo = list.get(0);

         extraInfo.setNickname(nickname);

         extraInfo.setUpdateTime(new Date());

         threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);

      }

		
      out.print(JsonUtil.loadTrueResult("修改成功"));

   }

	
   /**

    * 删除队员关系

    * @param acceptData

    * @param uid

    * @param inviteId 邀请id

    * @param out

    */

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

   public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {

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

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

         out.print(JsonUtil.loadFalseResult("操作数据无效"));

         return;

      }

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

      if (worker == null) {

         out.print(JsonUtil.loadFalseResult("操作数据无效"));

         return;

      }

		
      // 删除关系

      threeSaleSerivce.deleteByPrimaryKey(inviteId);

      // 删除备注

      threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());

	
      out.print(JsonUtil.loadTrueResult("操作成功"));

   }

	
}