admin
2022-08-25 146dbd5ed24c1fe63766aa45e0ce602caa39748e
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
@@ -113,18 +113,18 @@
            if (type != 1) {
                if (goodsType == Constant.SOURCE_TYPE_SUNING) {
                    String[] sts = SuningUtil.getGoodsIdDetail(id);
                    collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(sts[1]), goodsType);
                    collectionGoodsV2Service.cancelCollectionByAuctionId(uid, sts[1], goodsType);
                } else
                    collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(id), goodsType);
                    collectionGoodsV2Service.cancelCollectionByAuctionId(uid, id, goodsType);
                out.print(JsonUtil.loadTrueResult("取消收藏成功"));
                return;
            }
            Long goodsId = null;
            String goodsId = null;
            if (goodsType == Constant.SOURCE_TYPE_SUNING) {
                String[] sts = SuningUtil.getGoodsIdDetail(id);
                goodsId = Long.parseLong(sts[1]);
                goodsId =sts[1];
            } else
                goodsId = Long.parseLong(id);
                goodsId = id;
            CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsId, goodsType);
            if (find != null) {
                out.print(JsonUtil.loadFalseResult(""));
@@ -132,9 +132,9 @@
            }
            if (goodsType == Constant.SOURCE_TYPE_JD) {
                JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
                JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(Long.parseLong(goodsId));
                if (jdGoods == null) {
                    jdGoods = JDApiUtil.getGoodsDetail(goodsId);
                    jdGoods = JDApiUtil.getGoodsDetail(Long.parseLong(goodsId));
                }
                if (jdGoods == null) {
                    out.print(JsonUtil.loadFalseResult(1, "商品已下架"));
@@ -142,7 +142,7 @@
                }
                collectionGoodsV2Service.addJDCollection(uid, jdGoods);
            } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
                PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
                PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(Long.parseLong(goodsId));
                if (pddGoods == null) {
                    out.print(JsonUtil.loadFalseResult(1, "商品已下架"));
                    return;
@@ -246,10 +246,10 @@
        long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, notBackSuVip);
        JSONObject data = new JSONObject();
        List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
        List<GoodsDetailVO> list = new ArrayList<>();
        if (collectionGoodsList != null && collectionGoodsList.size() > 0) {
            List<Long> listGid = new ArrayList<Long>();
            List<String> listGid = new ArrayList<>();
            for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
                CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
                if (commonGoods == null || commonGoods.getGoodsType() != Constant.SOURCE_TYPE_TAOBAO) {
@@ -287,9 +287,9 @@
                if (listTaoKeGoods != null && listTaoKeGoods.size() > 0
                        && commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
                    int state = 1; // 默认停售
                    Long goodsId = commonGoods.getGoodsId();
                    String goodsId = commonGoods.getGoodsId();
                    for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
                        Long auctionId = taoKeGoods.getAuctionId();
                        String auctionId = taoKeGoods.getAuctionId();
                        if (goodsId == auctionId || goodsId.equals(auctionId)) {
                            state = 0; // 在售
                            break;