增加通用模板免单内容

admin

2019-08-19 27920d99bc5925de113aa4f0c22dbba3dcea672f

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

@@ -1,11 +1,6 @@
package com.yeshi.fanli.controller.client.v1;



import java.awt.image.BufferedImage;

import java.io.File;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.OutputStream;

import java.io.PrintWriter;

import java.io.UnsupportedEncodingException;

import java.lang.reflect.InvocationTargetException;

@@ -21,7 +16,6 @@
import java.util.UUID;



import javax.annotation.Resource;

import javax.imageio.ImageIO;

import javax.servlet.http.HttpServletRequest;



import org.apache.commons.beanutils.PropertyUtils;

@@ -90,6 +84,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

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

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

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

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

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

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

@@ -106,7 +101,6 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.HongBaoUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -114,7 +108,9 @@
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;

import com.yeshi.fanli.util.factory.AccountDetailsFactory;

import com.yeshi.fanli.util.factory.HongBaoFactory;

@@ -125,8 +121,6 @@
import com.yeshi.fanli.vo.user.UserInfoExtraVO;

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.coobird.thumbnailator.Thumbnails;

import net.coobird.thumbnailator.Thumbnails.Builder;

import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@@ -214,9 +208,13 @@


   @Resource

   private AccountMessageService accountMessageService;

	


   @Resource

   private MaskKeyService maskKeyService;



   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

	
   



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -586,7 +584,9 @@
      if (mySettings.getNoInvitationBonus() == null) {

         mySettings.setNoInvitationBonus(0);

      }



      if (mySettings.getOpenSpreadHongBao() == null) {

         mySettings.setOpenSpreadHongBao(0);

      }

      data.put("moduleState", mySettings);



      int welfareCenterNews = 0;

@@ -623,7 +623,7 @@
            uuser.setLastLoginIp(remotIP);

            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

            userInfoService.updateLoginInfo(uuser);

            // 更新用户附加信息，老用户不存在的需要添加

            // 用户等级更新

            try {

               userInfoExtraService.updateUserRankByUid(uuser.getId());

            } catch (UserInfoExtraException e) {

@@ -755,7 +755,8 @@
      data.put("error", "0");

      data.put("maxError", 1);

      String minMoney = configService.get(EXTRACT_MIN_MONEY); // 单笔提现的最小金额

      String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现的最大金额

      String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现的最小金额

      String maxDayMoney = configService.get("extract_money_day"); // 每日最大提现金额

      int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));

      ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);

      boolean canExtract = true;

@@ -764,15 +765,15 @@
         canExtract = false;

         errorMsg = String.format("每日最多提现%s次", maxDayCount + "");

      } else if (extractRecord != null

            && extractRecord.getMoney().add(new BigDecimal(minMoney)).compareTo(new BigDecimal(maxMoney)) > 0) {

            && extractRecord.getMoney().add(new BigDecimal(minMoney)).compareTo(new BigDecimal(maxDayMoney)) > 0) {

         canExtract = false;

         errorMsg = String.format("每日最多提现%s元", maxMoney);

         errorMsg = String.format("每日最多提现%s元", maxDayMoney);

      }

      data.put("canExtract", canExtract);

      data.put("extractErrorMsg", errorMsg);



      data.put("minMoney", minMoney);

      data.put("maxMoney", maxMoney);

      data.put("minMoney", minMoney);// 单笔最低

      data.put("maxMoney", maxMoney);// 单笔最高

      data.put("maxDayCount", maxDayCount);

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



@@ -1079,6 +1080,7 @@
    * @param type

    * @param out

    */

   @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) {

@@ -1195,7 +1197,7 @@
      } else if (etype == 111) {

         out.print(JsonUtil.loadFalseResult("更换了手机号后7天内不允许提现"));

      } else if (etype == 110) {

         out.print(JsonUtil.loadFalseResult(Constant.znxConfig.getExtractWrongMsg()));

         out.print(JsonUtil.loadFalseResult("有维权订单尚未扣款"));

      }



   }

@@ -1343,41 +1345,52 @@
      // count>0 有消息

      int count = accountMessageService.getCanOpenCount(uid);

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



      ThreadUtil.run(new Runnable() {

         @Override

         public void run() {

            // 用户等级更新

            try {

               userInfoExtraService.updateUserRankByUid(uid);

            } catch (Exception e) {

               LogHelper.errorDetailInfo(e);

            }

         }

      });

   }



   @RequestMapping("collectionGoods")

   public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, PrintWriter out) {

      CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);

      if (type == 1) {

         if (find != null) {

            out.print(JsonUtil.loadFalseResult(""));

            return;

         }

         try {

            TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

            collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);

            out.print(JsonUtil.loadTrueResult("收藏成功"));

         } catch (TaobaoGoodsDownException e) {

            out.print(JsonUtil.loadFalseResult(1, "商品已下架"));

         } catch (CollectionGoodsException e1) {

            out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));

         }

      } else {

         if (find == null) {

            out.print(JsonUtil.loadTrueResult("取消收藏成功"));

            return;

         } else {

      try {

         CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,

               Constant.SOURCE_TYPE_TAOBAO);

         if (type == 1) {

            if (find != null) {

               out.print(JsonUtil.loadFalseResult(""));

               return;

            }

            try {

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);

               TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

               collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);

               out.print(JsonUtil.loadTrueResult("收藏成功"));

            } catch (TaobaoGoodsDownException e) {

               out.print(JsonUtil.loadFalseResult(1, "商品已下架"));

            }

         } else {

            if (find == null) {

               out.print(JsonUtil.loadTrueResult("取消收藏成功"));

            } catch (CollectionGoodsException e) {

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

               return;

            } else {

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);

               out.print(JsonUtil.loadTrueResult("取消收藏成功"));

            }

         }

      } catch (CollectionGoodsException e1) {

         out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));

      }



   }



	
   /**

    * h5收藏

    * 

@@ -1388,30 +1401,40 @@
    * @param out

    */

   @RequestMapping("collectionGoodsJp")

   public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {

   public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType,

         PrintWriter out) {



      if (uid == null || auctionId == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(""));

         return;

      }



      CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);

      if (goodsType == null) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }



      CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId, goodsType);



      if (find == null) {

         // 添加收藏

         try {

            TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

            collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(1));

         } catch (TaobaoGoodsDownException e) {

            JsonUtil.printMode(out, callback, (JsonUtil.loadFalseResult(1, "商品已下架")));

         } catch (CollectionGoodsException e1) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));

         if (goodsType == Constant.SOURCE_TYPE_JD) {



         } else if (goodsType == Constant.SOURCE_TYPE_PDD) {



         } else {

            try {

               TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

               collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);

               JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(1));

            } catch (TaobaoGoodsDownException e) {

               JsonUtil.printMode(out, callback, (JsonUtil.loadFalseResult(1, "商品已下架")));

            } catch (CollectionGoodsException e1) {

               JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));

            }

         }

      } else {

         // 取消收藏

         try {

            collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);

            collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, goodsType);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("取消收藏成功"));

         } catch (CollectionGoodsException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

@@ -1424,11 +1447,11 @@
   public void collectionGoodsList(AcceptData acceptData, long uid, int page, PrintWriter out) {



      List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page + 1,

            Constant.PAGE_SIZE);

            Constant.PAGE_SIZE, Constant.SOURCE_TYPE_TAOBAO);



      List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();



      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, Constant.SOURCE_TYPE_TAOBAO);

      JSONObject data = new JSONObject();



      List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();

@@ -1505,14 +1528,16 @@
   }



   @RequestMapping("deleteCollectionGoods")

   public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, PrintWriter out) {

   public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType,

         PrintWriter out) {

      if (type != null && type == 1) {

         clearConllectionGoods(acceptData, uid, out);

      } else {

         if (!StringUtil.isNullOrEmpty(ids)) {

            Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {

               try {

                  collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr));

                  collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),

                        goodsType);

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -1672,6 +1697,7 @@


   }





   /**

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

    * 

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

         e.printStackTrace();

      }



   }

	


   /**

    * 用户队员信息保存 1.4.1

@@ -1820,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("保存成功"));

   }



   /**

@@ -2056,8 +2069,6 @@


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

         JSONObject data = new JSONObject();

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



         // 界面状态

         UserSettingsVO mySettings = null;

         try {

@@ -2082,6 +2093,14 @@
         if (mySettings.getNoInvitationBonus() == null) {

            mySettings.setNoInvitationBonus(0);

         }



         if (mySettings.getOpenSpreadHongBao() == null) {

            if (userTaoLiJinDetailService.countDetail(uid) > 0) {

               mySettings.setOpenSpreadHongBao(1);

            } else {

               mySettings.setOpenSpreadHongBao(0);

            }

         }

         data.put("moduleState", mySettings);



         int welfareCenterNews = 0;

@@ -2105,8 +2124,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));

@@ -2164,9 +2196,9 @@
      }

   }



	
   /**

    * 用户更换头像

    * 
    * @param acceptData

    * @param fileList

    * @param uid

@@ -2174,22 +2206,23 @@
    * @param out

    */

   @RequestMapping(value = "uploadPortrait")

   public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request, PrintWriter out) {

   public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request,

         PrintWriter out) {

      try {

         if (uid == null) {

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

            return;

         }

			


         if (file == null) {

            out.print(JsonUtil.loadFalseResult("上传文件不能为空"));

            return;

         }

			


         userInfoService.uploadPortrait(file, uid);

			


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

			


      } catch (UserInfoException e) {

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

         try {

@@ -2213,37 +2246,63 @@
         }

      }

   }

	


   /**

    * 更换昵称

    * 更换基础信息

    * 
    * @param acceptData

    * @param nickName

    * @param uid

    * @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 (!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);

         }

         

         if(maskKeyService.examineContent(nickName)) {

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

            return;

         // 修改微信号

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

            }

         }

         

         userInfoService.saveUserInfo(nickName, uid);

			
         // 修改性别

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

            }

         }

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

      } catch (UserInfoException e) {

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