奖励券使用区分订单下单三方日期

yujian

2019-08-28 d88c167fc5973a2c15ff1539e4cdab36e4a7842c

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

@@ -54,6 +54,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

@@ -96,6 +97,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;

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

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

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

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

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

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

@@ -108,6 +110,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 +216,10 @@


   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

	
   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -1694,6 +1701,7 @@


   }





   /**

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

    * 

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

         e.printStackTrace();

      }



   }

	


   /**

    * 用户队员信息保存 1.4.1

@@ -1842,48 +1850,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("保存成功"));

   }



   /**

@@ -2078,8 +2073,6 @@


         GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

         JSONObject data = new JSONObject();

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



         // 界面状态

         UserSettingsVO mySettings = null;

         try {

@@ -2135,8 +2128,21 @@
               userInfo.setRankNamePicture(null);

               userInfo.setRankIcon(null);

            }

				
            // 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); // 邀请码

         data.put("welfareCenterNews", welfareCenterNews);// 福利中心消息

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

@@ -2220,7 +2226,7 @@
         userInfoService.uploadPortrait(file, uid);



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



			
      } catch (UserInfoException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

         try {

@@ -2246,7 +2252,7 @@
   }



   /**

    * 更换昵称

    * 更换基础信息

    * 

    * @param acceptData

    * @param nickName

@@ -2254,28 +2260,59 @@
    * @param out

    */

   @RequestMapping(value = "saveInfo")

   public void saveInfo(AcceptData acceptData, String nickName, Long uid, PrintWriter out) {

   public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid, PrintWriter out) {

      try {

         if (uid == null) {

            out.print(JsonUtil.loadFalseResult("用户未登录"));

            return;

         }

         if (StringUtil.isNullOrEmpty(nickName)) {

            out.print(JsonUtil.loadFalseResult("昵称不能为空"));

            return;

         }

         if (nickName.length() > 200) {

            out.print(JsonUtil.loadFalseResult("昵称过长"));

            return;

         }



         if (maskKeyService.examineContent(nickName)) {

            out.print(JsonUtil.loadFalseResult("不能包含敏感词汇"));

            return;

         // 修改昵称

         if (!StringUtil.isNullOrEmpty(nickName)) {

            if (nickName.length() > 200) {

               out.print(JsonUtil.loadFalseResult("昵称过长"));

               return;

            }

				
            if (maskKeyService.examineContent(nickName)) {

               out.print(JsonUtil.loadFalseResult("不能包含敏感词汇"));

               return;

            }

            userInfoService.saveUserInfo(nickName, uid);

				
            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.nickName, nickName);

         }



         userInfoService.saveUserInfo(nickName, uid);



			
         // 修改微信号

         if (!StringUtil.isNullOrEmpty(weiXin)) {

            if (weiXin.length() > 32) {

               out.print(JsonUtil.loadFalseResult("微信号过长"));

               return;

            }

				
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            if (userInfoExtra != null) {

               UserInfoExtra extra = new UserInfoExtra();

               extra.setId(userInfoExtra.getId());

               extra.setWeiXin(weiXin);

               userInfoExtraService.saveUserInfoExtra(extra);

					
               userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.setWeiXinNum, weiXin);

            }

         }

			
         // 修改性别

         if (sex != null && sex > 0 && sex < 3) {

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            if (userInfoExtra != null) {

               UserInfoExtra extra = new UserInfoExtra();

               extra.setId(userInfoExtra.getId());

               extra.setSex(sex);

               userInfoExtraService.saveUserInfoExtra(extra);

					
               userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");

            }

         }

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

      } catch (UserInfoException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));