取消红包参数异常

admin

2018-12-10 5d59c0ad6e82b6255cf38c3dba715395af1d60a7

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

@@ -9,7 +9,6 @@
import java.util.Arrays;

import java.util.Date;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;

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

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

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

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

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

@@ -57,7 +57,6 @@
import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

@@ -773,7 +772,7 @@
      ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);

      boolean canExtract = true;

      String errorMsg = "";

      if (extractRecord != null && extractRecord.getCount() + 1 >= maxDayCount) {

      if (extractRecord != null && extractRecord.getCount() + 1 > maxDayCount) {

         canExtract = false;

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

      } else if (extractRecord != null

@@ -1505,15 +1504,13 @@
      // collectionGoodsService.findCollectionGoods(uid, page + 1);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

      JSONObject data = new JSONObject();

      Map<String, String> map = hongBaoManageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

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

      collectionGoodsList.parallelStream().forEachOrdered(cg -> {

         TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());

         goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,

               fcRate, "");

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

               proportion.toString(), "");

         taoBaoGoodsBriefExtra.setCreatetime(cg.getCreateTime());

         list.add(taoBaoGoodsBriefExtra);

      });

@@ -1643,6 +1640,42 @@
         resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);

      }



      // 安卓系统返回所有数据

      String platform = acceptData.getPlatform();

      if ("android".equalsIgnoreCase(platform)) {

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

         long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);



         long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);

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



         JSONObject bossData = null;

         ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

         if (threeSale != null) {

            bossData = new JSONObject();

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

         }



         String helpLink = configService.get("team_help_url");

         if (helpLink == null) {

            helpLink = "";

         }

         resultData.put("helpLink", helpLink);

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

   }



@@ -1661,11 +1694,9 @@


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

@@ -1705,42 +1736,49 @@
    * @param out

    */

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

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

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

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

         return;

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

      }



      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("修改成功"));

   }



   /**

@@ -1754,25 +1792,30 @@
    */

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

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

      try {

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

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

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

            return;

         }



      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("删除成功"));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("删除失败"));

         e.printStackTrace();

      }



      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("操作成功"));

   }



}