发圈相关bug修改

admin

2020-02-24 abf2ccd4a451d3c3c39ab65a56763bd0c76de39a

发圈相关bug修改

 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java

@@ -238,9 +238,10 @@
                if (goodsEvaluate != null && goodsEvaluate.getComments() != null
                        && goodsEvaluate.getComments().size() > 0) {
                    for (CommentInfo info : goodsEvaluate.getComments()) {
                        if (CommentInfoEnum.currencyCoupon == info.getType()) {
                            commentInfo = info;
                        }
                        if (info != null)
                            if (CommentInfoEnum.currencyCoupon == info.getType()) {
                                commentInfo = info;
                            }
                    }
                }
            }
@@ -268,9 +269,10 @@
                if (goodsEvaluate != null && goodsEvaluate.getComments() != null
                        && goodsEvaluate.getComments().size() > 0) {
                    for (CommentInfo info : goodsEvaluate.getComments()) {
                        if (CommentInfoEnum.goodsCoupon == info.getType()) {
                            commentInfo = info;
                        }
                        if (info != null)
                            if (CommentInfoEnum.goodsCoupon == info.getType()) {
                                commentInfo = info;
                            }
                    }
                }
            }
@@ -635,8 +637,7 @@
            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
            BigDecimal shareRate = hongBaoManageService.getShareRate();
            BigDecimal vipFanLiRate = hongBaoManageService.getVIPFanLiRate();
            ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
                    vipFanLiRate);
            ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, vipFanLiRate);

            if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
                try {
@@ -662,7 +663,7 @@
            JSONObject object = new JSONObject();
            object.put("goodsId", goodsDetail.getGoodsId());
            object.put("goodsType", goodsDetail.getGoodsType());
            object.put("picUrl",goodsDetail.getPicUrl());
            object.put("picUrl", goodsDetail.getPicUrl());
            object.put("imgList", goodsDetail.getImgList());
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
        } catch (Exception e) {

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

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.DynamicInfo;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
@@ -58,6 +59,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -123,6 +125,9 @@

    @Resource
    private QrCodeService qrCodeService;
	
    @Resource
    private ConvertLinkManager convertLinkManager;

    private final static long TYPE_REXIAO = 1;// 热销
    private final static long TYPE_TUIJIAN = 2;// 推荐
@@ -680,6 +685,17 @@
        out.print(JsonUtil.loadTrueResult(data));
    }

    /**
     * 
     * @param acceptData
     * @param uid
     * @param id
     * @param type
     *            1-放大 2-保存 3-分享
     * @param goodsId
     * @param goodsType
     * @param out
     */
    @RequestMapping(value = "evaluateShare", method = RequestMethod.POST)
    public void evaluateShare(AcceptData acceptData, Long uid, String id, Integer type, Long goodsId, Integer goodsType,
            PrintWriter out) {
@@ -739,31 +755,56 @@
        }

        List<String> list = new ArrayList<>();
        for (ImgInfo imgInfo : imgs) {
            GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
            if (goodsVO == null) {
                list.add(imgInfo.getUrl());
                continue;
        // 单品
        if (goodsEvaluate.getType() == EvaluateEnum.single) {
            for (ImgInfo imgInfo : imgs) {
                GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
                if (goodsVO == null) {
                    list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
                    continue;
                }

                String jumpLink = getJumpLink(goodsVO, user, inviteCode);
                if (!StringUtil.isNullOrEmpty(jumpLink)) {
                    list.add(jumpLink);
                }
            }

        } else if (goodsEvaluate.getType() == EvaluateEnum.multiple) {

            if (type == 1) {
                String jumpLink = getJumpLink(goodsVO, user, inviteCode);
                if (!StringUtil.isNullOrEmpty(jumpLink)) {
                    list.add(jumpLink);
                for (ImgInfo imgInfo : imgs) {
                    if (imgInfo.getGoodsVO() != null)
                        if (imgInfo.getGoodsVO().getGoodsId().longValue() == goodsId.longValue()
                                && imgInfo.getGoodsVO().getGoodsType() == goodsType.intValue()) {
                            String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, inviteCode);
                            if (!StringUtil.isNullOrEmpty(jumpLink)) {
                                list.add(jumpLink);
                            }
                            break;
                        }
                }
            } else if (type == 2) {
                if (goodsVO.getGoodsId().longValue() == goodsId.longValue()
                        && goodsVO.getGoodsType() == goodsType.intValue()) {
                    String jumpLink = getJumpLink(goodsVO, user, inviteCode);
                    if (!StringUtil.isNullOrEmpty(jumpLink)) {
                        list.add(jumpLink);
            } else if (type == 2 || type == 3) {
                for (ImgInfo imgInfo : imgs) {
                    if (imgInfo.getGoodsVO() != null) {
                        String jumpLink = getJumpLink(imgInfo.getGoodsVO(), user, inviteCode);
                        if (!StringUtil.isNullOrEmpty(jumpLink)) {
                            list.add(jumpLink);
                        }
                    }
                }
            } else if (type == 3){
                String jumpLink = getJumpLink(goodsVO, user, inviteCode);
                if (!StringUtil.isNullOrEmpty(jumpLink)) {
                    list.add(jumpLink);
                }
            }

        } else if (goodsEvaluate.getType() == EvaluateEnum.activity) {
            for (ImgInfo imgInfo : imgs) {
                if (imgInfo.getType() == ImgEnum.goods || imgInfo.getType() == ImgEnum.video)
                    continue;
                if (imgInfo.getType() == ImgEnum.img)
                    list.add(StringUtil.isNullOrEmpty(imgInfo.getUrlHD()) ? imgInfo.getUrl() : imgInfo.getUrlHD());
                else if (imgInfo.getType() == ImgEnum.activity)
                    if (!StringUtil.isNullOrEmpty(imgInfo.getActivityPic())) {
                        list.add(imgInfo.getActivityPic());
                    }
            }
        }

@@ -879,6 +920,14 @@
                }
            }
        }
		
        try {
            text=convertLinkManager.convertLinkFromText(text, uid, true);
        } catch (Exception e) {
            e.printStackTrace();
            out.print(JsonUtil.loadFalseResult("转链失败"));
            return;
        }

        JSONObject data = new JSONObject();
        data.put("text", text);

 fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java

@@ -103,7 +103,7 @@
    public List<GoodsEvaluate> queryValid(int start, int count, int dynamicType) {
        Date now = new Date();
        Query query = new Query();
        query.addCriteria(Criteria.where("state").is(dynamicType));
        query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
        query.addCriteria(Criteria.where("state").is(1));
        query.addCriteria(Criteria.where("startTime").lte(now));
        query.addCriteria(Criteria.where("endTime").gte(now));