增加通用模板免单内容

admin

2019-08-19 27920d99bc5925de113aa4f0c22dbba3dcea672f

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

@@ -108,6 +108,7 @@
import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.email.MailSenderUtil;

@@ -213,6 +214,8 @@


   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

	
	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -1077,7 +1080,7 @@
    * @param type

    * @param out

    */

   @RequestSerializableByKey(key = "uid")

   @RequestSerializableByKey(key = "#uid")

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

   public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,

         HttpServletRequest request, int type, PrintWriter out) {

@@ -1694,6 +1697,7 @@


   }





   /**

    * 用户队员列表查询 1.5.3查询有效队员

    * 

@@ -1727,15 +1731,10 @@
               bossData = new JSONObject();

               UserInfo boss = threeSale.getBoss();

               if (boss != null) {

                  bossData.put("bossId", boss.getId());

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

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

                  UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(boss.getId());

                  if (userInfoExtra != null) 
                     bossData.put("weiXin", userInfoExtra.getWeiXin());

               }



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

               Long createTime = threeSale.getCreateTime();

               Date inviteTime = new Date(createTime);

@@ -1832,8 +1831,8 @@
         out.print(JsonUtil.loadFalseResult("统计失败"));

         e.printStackTrace();

      }



   }

	


   /**

    * 用户队员信息保存 1.4.1

@@ -1847,48 +1846,35 @@
    */

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

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



      try {

         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(memoName);

            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(memoName);

            extraInfo.setUpdateTime(new Date());

            threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);

         }



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



      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("保存失败"));

         e.printStackTrace();

      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;

      }



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

      if (extraInfo == null) {

         extraInfo = new ThreeSaleExtraInfo();

         extraInfo.setWorker(worker);

         extraInfo.setNickname(memoName);

         extraInfo.setCreateTime(new Date());

         extraInfo.setUpdateTime(new Date());

         extraInfo.setBoss(new UserInfo(uid));

         threeSaleExtraInfoSerivce.insertSelective(extraInfo);

      } else {

         ThreeSaleExtraInfo updateInfo = new ThreeSaleExtraInfo();

         updateInfo.setId(extraInfo.getId());

         updateInfo.setNickname(memoName);

         updateInfo.setUpdateTime(new Date());

         threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(updateInfo);

      }

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

   }



   /**

@@ -2139,11 +2125,18 @@
               userInfo.setRankIcon(null);

            }

            

            userInfo.setSex(userInfoExtra.getSex());

            userInfo.setWeiXin(userInfoExtra.getWeiXin());

            // 1.6.5 之后返回性别、微信号

            if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

               if(userInfoExtra.getSex() != null)

                  userInfo.setSex(userInfoExtra.getSex());

					
               if(!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))

                  userInfo.setWeiXin(userInfoExtra.getWeiXin());

            }

         }

			
			
         // 1.6.5 之后返回 微信号提示

         if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))

            userInfo.setWeiXinTip("添加微信号后，你的邀请人和一级队员可以通过微信与你建立联系。");

         

         data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));

         data.put("invitCode", invitCode); // 邀请码