商品详情

yujian

2019-07-17 fe16122ad77ccd69c7f3c6dfff123c0c3aa3d35f

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

@@ -40,6 +40,7 @@
import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.dto.money.AccountDetails;

import com.yeshi.fanli.dto.order.OrderItem;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

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

@@ -58,6 +59,7 @@
import com.yeshi.fanli.entity.common.Config;

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

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

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.HongBaoOrder;

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

@@ -84,6 +86,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;

@@ -113,6 +116,8 @@
import com.yeshi.fanli.util.factory.AccountDetailsFactory;

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

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

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

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

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

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

@@ -209,6 +214,9 @@
   

   @Resource

   private MaskKeyService maskKeyService;

	
   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

   



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

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

         mySettings.setNoInvitationBonus(0);

      }



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

         mySettings.setOpenSpreadHongBao(0);

      }

      data.put("moduleState", mySettings);



      int welfareCenterNews = 0;

@@ -1352,21 +1362,56 @@
   }



   @RequestMapping("collectionGoods")

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

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

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

      if (goodsType ==  null) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }

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

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

			
         if (goodsType == Constant.SOURCE_TYPE_JD) {

            JDGoods jdGoods = JDApiUtil.queryGoodsDetail(auctionId);

            if (jdGoods == null) {

               jdGoods = JDApiUtil.getGoodsDetail(auctionId);

            }

				
            if (jdGoods == null) {

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

            } else {

               try {

                  collectionGoodsV2Service.addJDCollection(uid, jdGoods);

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

               } catch (CollectionGoodsException e) {

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

               }

            }

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

            PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(auctionId);

            if (pddGoods == null) {

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

               return;

            } 
            try {

               collectionGoodsV2Service.addPDDCollection(uid, pddGoods);

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

            } catch (CollectionGoodsException e) {

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

            }

				
         } else {

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

@@ -1374,7 +1419,7 @@
            return;

         } else {

            try {

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);

               collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, goodsType);

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

            } catch (CollectionGoodsException e) {

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

@@ -1394,30 +1439,39 @@
    * @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;

      }

		
      if (goodsType ==  null) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }



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

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

@@ -1430,11 +1484,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>();

@@ -1511,14 +1565,14 @@
   }



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

               }

@@ -2088,7 +2142,18 @@
         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;

         String invitCode = null;