Administrator
2020-02-24 f66e9ca44cca5d91fea3f3a54d9c31880c2c4a48
素材
2个文件已修改
116 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
@@ -444,6 +444,53 @@
    }
    /**
     * 获取信息
     *
     * @param callback
     * @param special
     *            0a39676f138c4dcba722e321d43c4284
     * @param out
     */
    @RequestMapping(value = "getSuCaiPic")
    public void getSuCaiPic(String callback, String pid, PrintWriter out) {
        try {
            String videoUrl = "";
            String videoPic = "";
            String activityUrl = "";
            List<String> list = new ArrayList<String>();
            if (!StringUtil.isNullOrEmpty(pid)) {
                GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
                if (goodsEvaluate != null && goodsEvaluate.getImgList() != null
                        && goodsEvaluate.getImgList().size() > 0) {
                    List<ImgInfo> imgList = goodsEvaluate.getImgList();
                    for (ImgInfo imgInfo : imgList) {
                        ImgEnum type = imgInfo.getType();
                        if (type == ImgEnum.video) {
                            videoPic = imgInfo.getUrl();
                            videoUrl = imgInfo.getVideoUrl();
                        } else if (type == ImgEnum.activity) {
                            activityUrl = imgInfo.getActivityPic();
                        } else if (type == ImgEnum.img) {
                            list.add(imgInfo.getUrl());
                        }
                    }
                }
            }
            JSONObject data = new JSONObject();
            data.put("activityUrl", activityUrl);
            data.put("videoUrl", videoUrl);
            data.put("videoPic", videoPic);
            data.put("list", list);
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
        } catch (Exception e) {
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));
            e.printStackTrace();
        }
    }
    /**
     * 保存信息
     * 
     * @param callback
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -812,6 +812,7 @@
        // 原封视频面图
        ImgInfo imgVideo = null;
        ImgInfo imgActivity = null;
        List<String> listDel = new ArrayList<String>();
        List<String> listOld = new ArrayList<String>();
        
@@ -829,10 +830,13 @@
                    if (!StringUtil.isNullOrEmpty(url)) {
                        listOld.add(url);
                    }
                } else if (type == ImgEnum.activity) {
                    imgActivity = info;
                }
            }
        }
        MultipartFile activityFile = null;
        // 视频部分
        if (fileRequest != null) {
            MultipartFile filevideo = fileRequest.getFile("filevideo");
@@ -866,6 +870,9 @@
                imgVideo.setW(width);
                imgVideo.setH(height);
            }
            activityFile = fileRequest.getFile("activityFile");
        }
        List<ImgInfo> listImg = new ArrayList<ImgInfo>();
@@ -884,6 +891,31 @@
                }
            }
        }
        if (activityFile != null) {
            InputStream inputStream = activityFile.getInputStream();
            BufferedImage sourceImg = ImageIO.read(inputStream);
            int width = sourceImg.getWidth();
            int height = sourceImg.getHeight();
            String picLink = uploadPicture(activityFile);
            ImgInfo activity = new ImgInfo();
            activity.setId(UUID.randomUUID().toString().replace("-", ""));
            activity.setLarge(true);
            activity.setPid(pid);
            activity.setUrl(picLink);
            activity.setUrlHD(picLink);
            activity.setActivityPic(picLink);
            activity.setW(width);
            activity.setH(height);
            activity.setType(ImgEnum.activity);
            listImg.add(activity);
        } else if (imgActivity != null) {
            listImg.add(imgActivity);
        }
        // 编辑图片
        if (!StringUtil.isNullOrEmpty(picUrls)) {
@@ -894,10 +926,6 @@
                    if (fileRequest != null) {
                        MultipartFile file = fileRequest.getFile("file" + i);
                        if (file != null) {
                            InputStream inputStream = file.getInputStream();
                            BufferedImage sourceImg = ImageIO.read(inputStream);
                            int width = sourceImg.getWidth();
                            int height = sourceImg.getHeight();
                            picLink = uploadPicture(file);
                            
                            ImgInfo imgInfo0 = new ImgInfo();
@@ -907,8 +935,8 @@
                            imgInfo0.setUrl(picLink);
                            imgInfo0.setUrlHD(picLink);
                            imgInfo0.setType(ImgEnum.img);
                            imgVideo.setW(width);
                            imgVideo.setH(height);
                            imgVideo.setW(1);
                            imgVideo.setH(1);
                            listImg.add(imgInfo0);
                            continue;
                        }
@@ -1173,13 +1201,40 @@
                GoodsDetailVO goods = goodsEvaluate.getGoods();
                if (goods != null) {
                    GoodsDetailVO goodsNew = getGoodsNewInfo(goods.getGoodsId(), goods.getGoodsType(), paramsDTO);
                    if (goodsNew != null)
                        goodsEvaluate.setGoods(goodsNew);
                }
                // 更新商品信息
                List<ImgInfo> imgList = goodsEvaluate.getImgList();
                if (imgList == null || imgList.size() == 0) {
                    continue;
                }
                for (ImgInfo imgInfo: imgList) {
                    SimpleGoods simpleGoods = imgInfo.getGoods();
                    if (simpleGoods == null) {
                        continue;
                    }
                    GoodsDetailVO goodsDetailVO = getGoodsNewInfo(simpleGoods.getGoodsId(), simpleGoods.getGoodsType(), paramsDTO);
                    if (goodsDetailVO != null) {
                        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);
                        }
                        imgInfo.setGoods(simpleGoods);
                        imgInfo.setGoodsVO(goodsDetailVO);
                    }
                }
                goodsEvaluate.setUpdateTime(new Date());
                goodsEvaluateDao.save(goodsEvaluate);
            }
        } catch (Exception e) {
            LogHelper.errorDetailInfo(e);