更改收藏接口

yujian

2019-07-31 d2546652966b03f9273d84312638f583665dec37

更改收藏接口

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

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

@@ -59,7 +58,6 @@
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;

@@ -116,8 +114,6 @@
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;

@@ -1361,74 +1357,37 @@
    }



    @RequestMapping("collectionGoods")

    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;

            }



            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, "商品已下架"));

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

        try {

            CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,

                    Constant.SOURCE_TYPE_TAOBAO);

            if (type == 1) {

                if (find != null) {

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

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

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

                return;

            } else {

                try {

                    collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, goodsType);

                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收藏

     * 


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java

@@ -21,10 +21,12 @@
import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

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

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

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

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

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

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

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

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

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

@@ -34,8 +36,13 @@
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;

import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

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

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

import com.yeshi.fanli.vo.goods.GoodsDetailVO;



@@ -54,7 +61,7 @@


    @Resource

    private BusinessSystemService businessSystemService;

	


    @Resource

    private HongBaoManageService hongBaoManageService;



@@ -64,10 +71,83 @@
    @Resource

    private ScanHistoryV2Service scanHistoryV2Service;



	
    @Resource

    private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



    @Resource

    private JDGoodsCacheUtil jdGoodsCacheUtil;



    @Resource

    private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;



    @Resource

    private RedisManager redisManager;



    

    /**

     * 收藏商品

     * @param acceptData

     * @param uid

     * @param id

     * @param type

     * @param goodsType

     * @param out

     */

    @RequestMapping("collectionGoods")

    public void collectionGoods(AcceptData acceptData, long uid, long id, int type, Integer goodsType,

            PrintWriter out) {

        try {

            if (goodsType == null) {

                goodsType = Constant.SOURCE_TYPE_TAOBAO;

            }



            if (type != 1) {

                collectionGoodsV2Service.cancelCollectionByAuctionId(uid, id, goodsType);

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

                return;

            }



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

            if (find != null) {

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

                return;

            }



            if (goodsType == Constant.SOURCE_TYPE_JD) {

                JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(id);

                if (jdGoods == null) {

                    jdGoods = JDApiUtil.getGoodsDetail(id);

                }

                if (jdGoods == null) {

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

                    return;

                }

                collectionGoodsV2Service.addJDCollection(uid, jdGoods);

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

                PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(id);

                if (pddGoods == null) {

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

                    return;

                }

                collectionGoodsV2Service.addPDDCollection(uid, pddGoods);

            } else {

                try {

                    TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(id);

                    collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);

                } catch (TaobaoGoodsDownException e) {

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

                    return;

                }

            }

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

        } catch (CollectionGoodsException e) {

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

        }

    }



    /**

     * 删除收藏

     * 
     * @param acceptData

     * @param ids

     * @param type

@@ -80,7 +160,7 @@
            out.print(JsonUtil.loadFalseResult("用户未登录"));

            return;

        }

		


        if (type != null && type == 1) { // 删除全部

            try {

                collectionGoodsV2Service.cancelCollectionByUid(uid);

@@ -102,8 +182,6 @@
        out.print(JsonUtil.loadTrueResult("删除成功"));

    }



	
	
    /**

     * 收藏列表

     * 

@@ -207,9 +285,9 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



	
    /**

     * 删除足迹

     * 
     * @param acceptData

     * @param type

     * @param uid

@@ -227,7 +305,7 @@
                out.print(JsonUtil.loadFalseResult("ids不能为空"));

                return;

            }

			


            String[] idStr = ids.split(",");

            for (String id : idStr) {

                scanHistoryV2Service.deleteByCommonIdAndDeviceOrUid(uid, acceptData.getDevice(), Long.parseLong(id));

@@ -235,10 +313,10 @@
        }

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

    }

	
	


    /**

     * 获取浏览记录

     * 
     * @param acceptData

     * @param uid

     * @param page

@@ -267,7 +345,7 @@
                }

            }

        });

		


        long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType);



        JSONArray array = new JSONArray();

@@ -283,7 +361,7 @@


                GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate,

                        shareRate);

				


                detailVO.setId(commonGoods.getId());

                detailVO.setCreatetime(sh.getCreateTime());

                array.add(gson.toJson(detailVO));

@@ -296,5 +374,5 @@
        out.print(JsonUtil.loadTrueResult(data));

        return;

    }

	


}