动态

yj

2020-03-04 797434495f603192642e0fdecbd947876129c7fd

动态

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

@@ -40,6 +40,7 @@
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.log.LogHelper;
@@ -66,6 +67,7 @@
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.dynamic.ArticleVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -671,6 +673,8 @@
            Gson gson = gsonBuilder.create();
            long count = goodsEvaluateService.countValidMaterials(type);
            
            JSONArray jsonArray = new JSONArray();
			
            String listStr = gson.toJson(list);
            JSONArray array = JSONArray.fromObject(listStr);
            for (int i = 0; i< array.size() ; i++) {
@@ -685,13 +689,13 @@
                        json.put("shareNum", salesCountMidea + "万");
                    } 
                }
//                array.add(json);
                jsonArray.add(json);
            }
            
            
            JSONObject data = new JSONObject();
            data.put("count", count);
            data.put("list", array);
            data.put("list", jsonArray);
            out.print(JsonUtil.loadTrueResult(data));
        } catch (Exception e) {
            e.printStackTrace();
@@ -870,9 +874,8 @@
            } catch (ShareGoodsException e) {
                e.printStackTrace();
            }

            jumpLink = configService.get(ConfigKeyEnum.taobaoShareQrcodeText.getKey()).replace("[淘口令]",
                    taoBaoLink.getTaoToken());
            jumpLink = ShareControllerV2.getERCodeContentNew(configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()),
                    taoBaoLink.getGoods(), TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
        } else if (goodsVO.getGoodsType() == Constant.SOURCE_TYPE_JD) {
            JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsVO.getGoodsId());
            if (jdGoods == null) {
@@ -900,6 +903,7 @@
        return null;
    }

	
    /**
     * 评论复制
     * 

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java

@@ -348,17 +348,15 @@
                if (picNum - 1 == i) {
                    imgInfo0.setType(ImgEnum.goods);
                    SimpleGoods simpleGoods = new SimpleGoods();
                    simpleGoods.setState(goodsDetailVO.getState());
                    simpleGoods.setGoodsId(goodsId);
                    simpleGoods.setGoodsType(goodsType);
                    simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
                    CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
                    if (couponInfo == null) {
                        simpleGoods.setPrice(goodsDetailVO.getZkPrice());
                        simpleGoods.setState(1);
                    } else {
                        simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
                        simpleGoods.setAmount(couponInfo.getAmount());
                        simpleGoods.setState(0);
                    }
                    imgInfo0.setGoods(simpleGoods);
                    imgInfo0.setGoodsVO(goodsDetailVO);
@@ -409,15 +407,13 @@
                if (commentInfo.getTypeEnum() == CommentInfoEnum.goodsCoupon) {
                    if (oldGoodsVO != null && oldGoodsVO.getGoodsId().longValue() == goodsId.longValue() 
                            && oldGoodsVO.getGoodsType() == goodsType) {
                        addComment = true;
                    } else {
                        addComment = false;
                    }
                    } 
                    continue;
                } 
                commentsNew.add(commentInfo);
            }
        }
        } 
        
        if (addComment) {
            String commentText = "";
@@ -606,18 +602,19 @@
                    imgInfo0.setType(ImgEnum.goods);

                    SimpleGoods simpleGoods = new SimpleGoods();
                    simpleGoods.setState(goodsDetailVO.getState());
                    simpleGoods.setGoodsId(goodsDetailVO.getGoodsId());
                    simpleGoods.setGoodsType(goodsDetailVO.getGoodsType());
                    simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
                    CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
                    if (couponInfo == null) {
                        simpleGoods.setState(1);
                        simpleGoods.setPrice(goodsDetailVO.getZkPrice());
                    } else {
                        simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
                        simpleGoods.setAmount(couponInfo.getAmount());
                        simpleGoods.setState(0);
                    }
                    imgInfo0.setGoods(simpleGoods);
                    imgInfo0.setGoodsVO(goodsDetailVO);
					
                    listImg.add(imgInfo0);
                    totalImg++;
                }
@@ -1400,8 +1397,12 @@
                GoodsDetailVO goods = goodsEvaluate.getGoods();
                if (goods != null) {
                    GoodsDetailVO goodsNew = getGoodsNewInfo(goods.getGoodsId(), goods.getGoodsType(), paramsDTO);
                    if (goodsNew != null)
                    if (goodsNew != null) {
                        goodsEvaluate.setGoods(goodsNew);
                    } else {
                        goods.setState(1);
                        goodsEvaluate.setGoods(goods);
                    }
                }
                // 更新商品信息
                List<ImgInfo> imgList = goodsEvaluate.getImgList();
@@ -1422,14 +1423,20 @@
                        CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
                        if (couponInfo == null) {
                            simpleGoods.setPrice(goodsDetailVO.getZkPrice());
                            simpleGoods.setState(1);
                        } else {
                            simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
                            simpleGoods.setAmount(couponInfo.getAmount());
                            simpleGoods.setState(0);
                        }
                        imgInfo.setGoods(simpleGoods);
                        imgInfo.setGoodsVO(goodsDetailVO);
                    } else {
                        simpleGoods.setState(1);
                        imgInfo.setGoods(simpleGoods);
                        GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
                        if (goodsVO != null) {
                            goodsVO.setState(1);
                            imgInfo.setGoodsVO(goodsVO);
                        }
                    }
                }

@@ -1504,13 +1511,11 @@
                    SimpleGoods simpleGoods = new SimpleGoods();
                    simpleGoods.setGoodsId(goodsVO.getGoodsId());
                    simpleGoods.setGoodsType(goodsVO.getGoodsType());

                    simpleGoods.setState(goodsVO.getState());
                    CouponInfoVO couponInfo = goodsVO.getCouponInfo();
                    if (couponInfo == null) {
                        simpleGoods.setState(0);
                        simpleGoods.setPrice(goodsVO.getZkPrice());
                    } else {
                        simpleGoods.setState(goodsVO.getState());
                        simpleGoods.setPrice(goodsVO.getCouponPrice());
                        simpleGoods.setAmount(couponInfo.getAmount());
                    }