去除老版本收藏

admin

2018-12-04 57b80e02ce56e3cacff75ba789fc633ab46b911a

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

@@ -15,9 +15,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -38,7 +35,6 @@
import com.yeshi.fanli.entity.bus.user.AccountDetails;

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

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

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

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

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

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

@@ -59,10 +55,13 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.exception.BindingAccountException;

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;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

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

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

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

@@ -94,6 +93,9 @@
import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/v1/customer")

@@ -151,8 +153,6 @@
   private AccountMessageService accountMessageService;



   @Resource

   private CollectionGoodsService collectionGoodsService;

   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

@@ -169,6 +169,9 @@


   @Resource

   private UserActiveLogService userActiveLogService;



   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -1419,24 +1422,32 @@


   @RequestMapping("collectionGoods")

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

      CollectionGoods find = collectionGoodsService.findByUidAndAuctionId(uid, auctionId);

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

      if (type == 1) {

         if (find != null) {

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

            return;

         }

         CollectionGoods cg = TaoBaoUtil.getCollectionGoods(auctionId, new UserInfo(uid));

         collectionGoodsService.save(cg);

         try {

            TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

            collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);

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

         return;

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

            collectionGoodsService.delete(find);

            try {

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);

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

            return;

            } catch (CollectionGoodsException e) {

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

            }

         }

      }



@@ -1459,37 +1470,51 @@
         return;

      }



      CollectionGoods find = collectionGoodsService.findByUidAndAuctionId(uid, auctionId);

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



      if (find == null) {

         // 添加收藏

         CollectionGoods cg = TaoBaoUtil.getCollectionGoods(auctionId, new UserInfo(uid));

         collectionGoodsService.save(cg);

         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 {

         // 取消收藏

         collectionGoodsService.delete(find);

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

         try {

            collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);

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

         } catch (CollectionGoodsException e) {

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

         }

      }



   }



   @RequestMapping("collectionGoodsList")

   public void collectionGoodsList(AcceptData acceptData, long uid, int page, PrintWriter out) {

      List<CollectionGoods> coList = collectionGoodsService.findCollectionGoods(uid, page + 1);

      int count = collectionGoodsService.getCount(uid);



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

            Constant.PAGE_SIZE);



      // List<CollectionGoods> coList =

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

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

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

         TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.getTaoBaoGoodsBrief(cg);

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

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

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

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,

               fcRate, "");

         taoBaoGoodsBriefExtra.setCreatetime(new Date(cg.getCreateTime()));



         taoBaoGoodsBriefExtra.setCreatetime(cg.getCreateTime());

         list.add(taoBaoGoodsBriefExtra);

      });

      GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

@@ -1517,7 +1542,11 @@
      } else {

         if (!StringUtil.isNullOrEmpty(ids)) {

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

               collectionGoodsService.delete(Long.parseLong(auctionIdStr), uid);

               try {

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

               } catch (Exception e) {

                  e.printStackTrace();

               }

            });

         }

      }

@@ -1526,7 +1555,12 @@


   @RequestMapping("clearConllectionGoods")

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

      collectionGoodsService.clear(uid);

      try {

         collectionGoodsV2Service.cancelCollectionByUid(uid);

      } catch (CollectionGoodsException e) {

         e.printStackTrace();

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

      }

      out.print(JsonUtil.loadTrueResult("删除成功"));

   }



@@ -1590,9 +1624,9 @@
            .loadTrueResult(String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl())));

   }



	
   /**

    * 用户队员列表查询 1.4.1

    * 
    * @param acceptData

    * @param id

    * @param out

@@ -1614,6 +1648,7 @@
   

   /**

    * 用户队员统计 1.4.1

    * 
    * @param acceptData

    * @param id

    * @param out

@@ -1643,7 +1678,6 @@
         bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));

      }

      

		
      JSONObject resultData = new JSONObject();

      

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

@@ -1662,9 +1696,11 @@
   

   /**

    * 用户队员信息保存 1.4.1

    * 
    * @param acceptData

    * @param uid

    * @param inviteId 邀请id

    * @param inviteId

    *            邀请id

    * @param nickname

    * @param out

    */

@@ -1709,9 +1745,11 @@
   

   /**

    * 删除队员关系

    * 
    * @param acceptData

    * @param uid

    * @param inviteId 邀请id

    * @param inviteId

    *            邀请id

    * @param out

    */

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