yj
2020-03-06 bf6ca2b873f4d3c71d2810fad2683b03ae5efe4a
发圈
4个文件已修改
20 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
@@ -116,8 +116,10 @@
            if (request instanceof MultipartHttpServletRequest) {
                fileRequest = (MultipartHttpServletRequest) request;
            }
            goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum, picUrls, fileRequest);
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));
            String commentText = goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum, picUrls, fileRequest);
            JSONObject object = new JSONObject();
            object.put("comment", commentText);
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
        } catch (GoodsEvaluateException e) {
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
        } catch (Exception e) {
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -799,7 +799,7 @@
                // 单品
                if (goodsEvaluate.getType() == EvaluateEnum.single) {
                    for (ImgInfo imgInfo : imgs) {
                        if (type == 3 && imgInfo.getType() == ImgEnum.video)
                        if (imgInfo.getType() == ImgEnum.video)
                            continue;
                        GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -234,7 +234,7 @@
    }
    @Override
    public void saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum,
    public String saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum,
            String picUrls, MultipartHttpServletRequest fileRequest) throws GoodsEvaluateException, Exception {
        if (StringUtil.isNullOrEmpty(pid)) {
            throw new GoodsEvaluateException(1, "请保存第一部分信息");
@@ -461,8 +461,8 @@
         * = false; }
         */
        String commentText = "";
        if (addComment) {
            String commentText = "";
            if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
                TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, "0");
                String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
@@ -512,6 +512,8 @@
                }
            }
        }
        return commentText;
    }
    private String createTokenAndLink(GoodsDetailVO goodsDetailVO) throws Exception {
@@ -1229,8 +1231,8 @@
                            imgInfo0.setUrl(picLink);
                            imgInfo0.setUrlHD(picLink);
                            imgInfo0.setType(ImgEnum.img);
                            imgVideo.setW(1);
                            imgVideo.setH(1);
                            imgInfo0.setW(1);
                            imgInfo0.setH(1);
                            listImg.add(imgInfo0);
                            continue;
                        }
fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
@@ -75,7 +75,7 @@
     * @throws GoodsEvaluateException
     * @throws Exception
     */
    public void saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls,
    public String saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls,
            MultipartHttpServletRequest fileRequest) throws GoodsEvaluateException, Exception;
    /**