From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 08 六月 2020 17:27:02 +0800 Subject: [PATCH] 券后价调整 --- fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 209 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 128 insertions(+), 81 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java index 911bbd4..c1dda2a 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java @@ -31,6 +31,8 @@ import com.yeshi.fanli.dto.ConfigParamsDTO; import com.yeshi.fanli.dto.jd.JDCouponInfo; import com.yeshi.fanli.dto.pdd.PDDGoodsDetail; +import com.yeshi.fanli.dto.suning.SuningGoodsInfo; +import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo; import com.yeshi.fanli.entity.bus.activity.ActivityUser; import com.yeshi.fanli.entity.bus.clazz.GoodsClass; import com.yeshi.fanli.entity.dynamic.CommentInfo; @@ -90,7 +92,7 @@ @Resource private HongBaoManageService hongBaoManageService; - + @Resource private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService; @@ -115,18 +117,17 @@ @Resource private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service; - @Override public void switchState(String id) throws GoodsEvaluateException { if (id == null) { throw new GoodsEvaluateException(1, "璇蜂紶閫掓纭弬鏁�"); } - + GoodsEvaluate resultObj = goodsEvaluateDao.getById(id); if (resultObj == null) { throw new GoodsEvaluateException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�"); } - + Integer state = resultObj.getState(); if (state == null || state == 0) { state = 1; @@ -135,8 +136,7 @@ } goodsEvaluateDao.updateSatate(id, state); } - - + @Override public String saveHead(MultipartFile file, GoodsEvaluate record) throws GoodsEvaluateException { Integer state = record.getState(); @@ -253,21 +253,22 @@ } return null; } - + private ImgInfo uploadOriginalPicture(MultipartFile file) { try { InputStream inputStream = file.getInputStream(); String contentType = file.getContentType(); String type = contentType.substring(contentType.indexOf("/") + 1); - String filePath = FilePathEnum.goodsEvaluate.getPath() + UUID.randomUUID().toString().replace("-", "") + "."+ type; - + String filePath = FilePathEnum.goodsEvaluate.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + + type; + BufferedImage sourceImg = ImageIO.read(inputStream); ImgInfo info = new ImgInfo(); int width = sourceImg.getWidth(); int height = sourceImg.getHeight(); - + String picLink = COSManager.getInstance().uploadFile(file.getInputStream(), filePath).getUrl(); - + info.setH(height); info.setW(width); info.setUrl(picLink); @@ -277,7 +278,6 @@ } return null; } - private String uploadPicture(File file, String contentType) throws Exception { InputStream inputStream = new FileInputStream(file); @@ -300,7 +300,7 @@ } @Override - public String saveSingleGoods(String pid, Long goodsId, Integer goodsType, String videoUrl, Integer picNum, + public String saveSingleGoods(String pid, String goodsId, Integer goodsType, String videoUrl, Integer picNum, String picUrls, MultipartHttpServletRequest fileRequest) throws GoodsEvaluateException, Exception { if (StringUtil.isNullOrEmpty(pid)) { throw new GoodsEvaluateException(1, "璇蜂繚瀛樼涓�閮ㄥ垎淇℃伅"); @@ -421,16 +421,16 @@ params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate()); if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { try { - TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId); + TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsId)); goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, params); } catch (TaobaoGoodsDownException e) { throw new GoodsEvaluateException(1, "鍟嗗搧宸蹭笅鏋�"); } } else if (goodsType == Constant.SOURCE_TYPE_JD) { - jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId); + jdGoods = jdGoodsCacheUtil.getGoodsInfo(Long.parseLong(goodsId)); goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(jdGoods, params); } else if (goodsType == Constant.SOURCE_TYPE_PDD) { - pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId); + pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(Long.parseLong(goodsId)); goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(pddGoods, params); } @@ -518,7 +518,7 @@ if (comments != null && comments.size() > 0) { for (CommentInfo commentInfo : comments) { if (commentInfo.getTypeEnum() == CommentInfoEnum.goodsCoupon) { - if (oldGoodsVO != null && oldGoodsVO.getGoodsId().longValue() == goodsId.longValue() + if (oldGoodsVO != null && oldGoodsVO.getGoodsId().equalsIgnoreCase(goodsId) && oldGoodsVO.getGoodsType() == goodsType) { addComment = false; } @@ -537,7 +537,7 @@ String commentText = ""; if (addComment) { if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { - TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsId, "0"); + TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, Long.parseLong(goodsId), "0"); String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()); commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); } else if (goodsType == Constant.SOURCE_TYPE_JD) { @@ -555,7 +555,7 @@ } commentText = template.replace("[閾炬帴]", jumpLink); } else if (goodsType == Constant.SOURCE_TYPE_PDD) { - String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", "1"); + String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(Long.parseLong(goodsId), PinDuoDuoApiUtil.PID_SHARE + "", "1"); if (jumpLink == null) { throw new GoodsEvaluateException(1, "璇ュ晢鍝佽浆閾惧け璐�"); } @@ -603,13 +603,13 @@ private String createTokenAndLink(GoodsDetailVO goodsDetailVO) throws Exception { String commentText = ""; if (goodsDetailVO.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) { - TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsDetailVO.getGoodsId(), "0"); + TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L,Long.parseLong(goodsDetailVO.getGoodsId()), "0"); String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey()); commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); } else if (goodsDetailVO.getGoodsType() == Constant.SOURCE_TYPE_JD) { String couponUrl = null; - JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsDetailVO.getGoodsId()); + JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(Long.parseLong(goodsDetailVO.getGoodsId())); JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods); if (couponInfo != null) { couponUrl = couponInfo.getLink(); @@ -620,7 +620,7 @@ String template = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey()); commentText = template.replace("[閾炬帴]", jumpLink); } else if (goodsDetailVO.getGoodsType() == Constant.SOURCE_TYPE_PDD) { - String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsDetailVO.getGoodsId(), + String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(Long.parseLong(goodsDetailVO.getGoodsId()), PinDuoDuoApiUtil.PID_SHARE + "", "1"); String template = configService.get(ConfigKeyEnum.quickSharePDDCommentText.getKey()); commentText = template.replace("[閾炬帴]", jumpLink); @@ -800,7 +800,7 @@ } boolean del = false; - long oldGoodsId = old.getGoods().getGoodsId().longValue(); + String oldGoodsId = old.getGoods().getGoodsId(); int oldGoodsType = old.getGoods().getGoodsType().intValue(); for (ImgInfo newInfo : listImg) { ImgEnum type2 = old.getType(); @@ -808,7 +808,7 @@ continue; } - if (oldGoodsId == newInfo.getGoods().getGoodsId().longValue() + if (oldGoodsId .equalsIgnoreCase(newInfo.getGoods().getGoodsId()) && oldGoodsType == newInfo.getGoods().getGoodsType().intValue()) { String url = newInfo.getUrl(); if (url.equals(old.getUrl())) { @@ -907,7 +907,7 @@ if (StringUtil.isNullOrEmpty(commentInfo.getId())) { commentInfo.setId(UUID.randomUUID().toString().replace("-", "")); } - + commentInfo.setNeedSpin(true); commentInfo.setType(commentInfo.getTags()); commentInfo.setTypeEnum(CommentInfoEnum.goodsCoupon); @@ -922,7 +922,6 @@ goodsEvaluateDao.save(resultObj); } - @Override public void saveCurrencyCoupon(String pid, int kind, CommentInfo commentInfo) throws GoodsEvaluateException, Exception { @@ -933,7 +932,7 @@ GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid); if (resultObj == null) throw new GoodsEvaluateException(1, "绗竴閮ㄥ垎淇℃伅缂哄け"); - + if (EvaluateEnum.activity != resultObj.getType()) { if (StringUtil.isNullOrEmpty(commentInfo.getCoupon())) { throw new GoodsEvaluateException(1, "鍒搁潰棰濅笉鑳戒负绌�"); @@ -965,7 +964,7 @@ if (commentInfo.getNeedSpin() == null) { commentInfo.setNeedSpin(false); } - + String content = commentInfo.getContent(); if (!StringUtil.isNullOrEmpty(content) && commentInfo.getNeedSpin()) { try { @@ -978,7 +977,6 @@ throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴"); } } - List<CommentInfo> comments = new ArrayList<>(); CommentInfo currencyCoupon = null; @@ -1039,7 +1037,7 @@ GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid); if (resultObj == null) throw new GoodsEvaluateException(1, "绗竴閮ㄥ垎淇℃伅缂哄け"); - + if (imgInfo == null || StringUtil.isNullOrEmpty(imgInfo.getActivityUrl())) { throw new GoodsEvaluateException(1, "娲诲姩閾炬帴涓嶈兘涓虹┖"); } @@ -1057,7 +1055,7 @@ } } } - + // 瑙嗛閮ㄥ垎 if (fileRequest != null) { MultipartFile filevideo = fileRequest.getFile("filevideo"); @@ -1090,7 +1088,6 @@ } } - List<ImgInfo> listImg = new ArrayList<ImgInfo>(); if (imgVideo != null) { if (!StringUtil.isNullOrEmpty(imgInfo.getVideoUrl())) { @@ -1106,7 +1103,7 @@ } } } - + String activityUrl = imgInfo.getActivityUrl(); // 缂栬緫鍥剧墖 List<ImgInfo> tempList = new ArrayList<ImgInfo>(); @@ -1117,7 +1114,7 @@ String picLink = pics[i]; if (picLink.startsWith("http")) { if (listOld != null) { - for (ImgInfo info: listOld) { + for (ImgInfo info : listOld) { if (info.getUrl().equals(picLink)) { info.setActivityUrl(activityUrl); tempList.add(info); @@ -1130,7 +1127,6 @@ } } - // 涓婁紶鏂囦欢鏇挎崲 if (fileRequest != null) { for (int i = 0; i < 9; i++) { @@ -1152,11 +1148,10 @@ } else { tempList.add(imgInfo0); } - } + } } } - - + int lineNum = 0; int totalImg = tempList.size(); if (totalImg > 0) { @@ -1170,19 +1165,19 @@ lineNum = 3; } } - + // 涓�寮犲浘鏄剧ず涓哄ぇ鍥� if (tempList.size() == 1) { tempList.get(0).setLarge(true); } - + if (tempList.size() > 0) { listImg.addAll(tempList); } - + // 娓呯悊鑰佸浘鐗� if (listOld != null && listOld.size() > 0) { - for (ImgInfo infoOld: listOld) { + for (ImgInfo infoOld : listOld) { boolean del = true; String oldPic = infoOld.getUrl(); for (ImgInfo info : listImg) { @@ -1194,12 +1189,12 @@ listDel.add(infoOld.getUrl()); } } - + resultObj.setJumpLink(activityUrl); resultObj.setLineNum(lineNum); resultObj.setImgList(listImg); goodsEvaluateDao.save(resultObj); - + // 鍒犻櫎鍥剧墖 if (listDel.size() > 0) { for (String url : listDel) { @@ -1423,7 +1418,14 @@ public GoodsEvaluate getById(String id) { return goodsEvaluateDao.getById(id); } + + + @Override + public List<GoodsEvaluate> listByStartTime(Date date) { + return goodsEvaluateDao.listByStartTime(date); + } + @Override public void saveComment(String pid, CommentInfo commentInfo) throws GoodsEvaluateException { GoodsEvaluate goodsEvaluate = goodsEvaluateDao.getById(pid); @@ -1540,7 +1542,8 @@ } @Override - public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum) { + public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, + String typeEnum) { return goodsEvaluateDao.query(start, count, key, state, dynamicType, typeEnum); } @@ -1600,7 +1603,7 @@ // 鍒犻櫎宸茶繃鏈� removeOverdue(); - + removeDownGoods(); } }); @@ -1769,7 +1772,7 @@ // 鍒犻櫎宸茶繃鏈� removeOverdue(); - + removeDownGoods(); } }); @@ -1796,7 +1799,7 @@ try { Date now = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55"); params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate()); for (GoodsEvaluate goodsEvaluate : list) { @@ -1822,7 +1825,7 @@ if (commentInfoEnum != null && commentInfoEnum == CommentInfoEnum.currencyCoupon) { String endTime = commentInfo.getEndTime(); if (!StringUtil.isNullOrEmpty(endTime)) { - Date endDay = sdf.parse(endTime); + Date endDay = format.parse(endTime); if (endDay.getTime() < now.getTime()) { goodsEvaluate.setState(0); // 娲诲姩杩囨湡 } @@ -1891,12 +1894,12 @@ } } - private GoodsDetailVO getGoodsNewInfo(Long goodsId, int goodsType, ConfigParamsDTO paramsDTO) { + private GoodsDetailVO getGoodsNewInfo(String goodsId, int goodsType, ConfigParamsDTO paramsDTO) { GoodsDetailVO vo = null; if (goodsType == Constant.SOURCE_TYPE_TAOBAO) { TaoBaoGoodsBrief goods; try { - goods = redisManager.getTaoBaoGoodsBrief(goodsId); + goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsId)); if (goods != null) { vo = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO); } @@ -1905,12 +1908,12 @@ } } else if (goodsType == Constant.SOURCE_TYPE_JD) { - JDGoods goodsInfo = jdGoodsCacheUtil.getGoodsInfo(goodsId); + JDGoods goodsInfo = jdGoodsCacheUtil.getGoodsInfo(Long.parseLong(goodsId)); if (goodsInfo != null) { vo = GoodsDetailVOFactory.convertJDGoods(goodsInfo, paramsDTO); } } else if (goodsType == Constant.SOURCE_TYPE_PDD) { - PDDGoodsDetail goodsInfo = pinDuoDuoCacheUtil.getGoodsInfo(goodsId); + PDDGoodsDetail goodsInfo = pinDuoDuoCacheUtil.getGoodsInfo(Long.parseLong(goodsId)); if (goodsInfo != null) vo = GoodsDetailVOFactory.convertPDDGoods(goodsInfo, paramsDTO); } @@ -1918,7 +1921,7 @@ } @Override - public void addGoodsEvaluate(Long goodsId, List<ImgInfo> imgList, ActivityUser user, String title, String comment, + public void addGoodsEvaluate(String goodsId, List<ImgInfo> imgList, ActivityUser user, String title, String comment, Date startTime) throws GoodsEvaluateException { if (goodsId == null || user == null || StringUtil.isNullOrEmpty(title)) { throw new GoodsEvaluateException(1, "鐩稿叧鍙傛暟涓嶈兘涓虹┖"); @@ -1930,7 +1933,7 @@ TaoBaoGoodsBrief goodsBrief = null; try { - goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId); + goodsBrief = redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsId)); } catch (TaobaoGoodsDownException e) { throw new GoodsEvaluateException(1, "鍟嗗搧宸蹭笅鏋�"); } @@ -2003,8 +2006,9 @@ if (!goodsVO.isHasCoupon()) { commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘"); commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", ""); - commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n","\r\n"); - } + commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", + "\r\n"); + } commentInfo.setContent(commentText); commentInfo.setType(CommentInfoEnum.goodsCoupon.getDesc()); } @@ -2059,7 +2063,7 @@ for (GoodsEvaluate goodsEvaluate : listExist) { GoodsDetailVO goods = goodsEvaluate.getGoods(); if (goods != null && goods.getGoodsType() == 1) { - listId.add(goods.getGoodsId()); + listId.add(Long.parseLong(goods.getGoodsId())); } } } @@ -2157,7 +2161,6 @@ } imgs.addAll(goodsimgs); - int i = 0; List<ImgInfo> imgList = new ArrayList<>(); for (String img : imgs) { @@ -2196,8 +2199,9 @@ if (!goodsVO.isHasCoupon()) { commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘"); commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", ""); - commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n"); - } + commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n") + .replace("\r\n\r\n", "\r\n"); + } CommentInfo commentInfo = new CommentInfo(); commentInfo.setNeedSpin(true); @@ -2240,7 +2244,7 @@ imgList.add(imgInfo); i++; } - + int lineNum = 0; if (imgList.size() > 0) { if (imgList.size() == 1) { @@ -2313,7 +2317,7 @@ return; } List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, - goods.getAuctionId()); + goods.getAuctionId()+""); if (queryExist == null || queryExist.size() == 0) { return; } @@ -2333,7 +2337,7 @@ if (jdGoods == null) { return; } - List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_JD, jdGoods.getSkuId()); + List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_JD, jdGoods.getSkuId()+""); if (queryExist == null || queryExist.size() == 0) { return; } @@ -2350,7 +2354,7 @@ if (pddGoods == null) { return; } - List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_PDD, pddGoods.getGoodsId()); + List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_PDD, pddGoods.getGoodsId()+""); if (queryExist == null || queryExist.size() == 0) { return; } @@ -2361,12 +2365,46 @@ updateGoods(queryExist, goodsNew); } + @Override + public void updateVIPGoods(VIPGoodsInfo goods) { + if (goods == null) { + return; + } + List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_VIP, + goods.getGoodsId()); + if (queryExist == null || queryExist.size() == 0) { + return; + } + + ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55"); + paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate()); + GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO); + updateGoods(queryExist, goodsNew); + } + + @Override + public void updateSuningGoods(SuningGoodsInfo goods) { + if (goods == null) { + return; + } + List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_SUNING, + goods.getCommodityInfo().getCommodityCode()); + if (queryExist == null || queryExist.size() == 0) { + return; + } + + ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55"); + paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate()); + GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO); + updateGoods(queryExist, goodsNew); + } + private void updateGoods(List<GoodsEvaluate> listExist, GoodsDetailVO goodsNew) { - long goodsId = goodsNew.getGoodsId(); + String goodsId = goodsNew.getGoodsId(); int goodsType = goodsNew.getGoodsType(); for (GoodsEvaluate goodsEvaluate : listExist) { GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods(); - if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null && goodsDetailVO.getGoodsId() == goodsId + if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null && goodsDetailVO.getGoodsId().equalsIgnoreCase(goodsId) && goodsDetailVO.getGoodsType() == goodsType) { goodsEvaluate.setGoods(goodsNew); } @@ -2379,7 +2417,7 @@ for (ImgInfo imgInfo : imgList) { SimpleGoods simpleGoods = imgInfo.getGoods(); - if (simpleGoods == null || simpleGoods.getGoodsId() != goodsId + if (simpleGoods == null || !simpleGoods.getGoodsId().equalsIgnoreCase(goodsId) || goodsType != simpleGoods.getGoodsType()) { continue; } @@ -2403,19 +2441,18 @@ goodsEvaluateDao.save(goodsEvaluate); } } - - + @Override - public void offlineTaoBaoGoods(Long goodsId) { + public void offlineTaoBaoGoods(String goodsId) { try { if (goodsId == null) { return; } - List<GoodsEvaluate> list = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId); + List<GoodsEvaluate> list = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO,goodsId); if (list == null || list.size() == 0) { return; } - + // 涓嬫灦鍟嗗搧 offlineGoods(list, Constant.SOURCE_TYPE_TAOBAO, goodsId); } catch (Exception e) { @@ -2424,13 +2461,13 @@ } @CacheEvict(value = "dynamicCache", allEntries = true) - private void offlineGoods(List<GoodsEvaluate> list, int goodsType, Long goodsId) { - + private void offlineGoods(List<GoodsEvaluate> list, int goodsType, String goodsId) { + for (GoodsEvaluate goodsEvaluate : list) { // 鍟嗗搧涓嬫灦 GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods(); goodsDetailVO.setState(1); - + List<ImgInfo> imgList = goodsEvaluate.getImgList(); if (imgList == null || imgList.size() == 0) { goodsEvaluate.setUpdateTime(new Date()); @@ -2447,7 +2484,7 @@ simpleGoods.setState(1); GoodsDetailVO goodsVO = imgInfo.getGoodsVO(); goodsVO.setState(1); - + imgInfo.setGoods(simpleGoods); imgInfo.setGoodsVO(goodsVO); } @@ -2457,15 +2494,14 @@ goodsEvaluateDao.save(goodsEvaluate); } } - /** * 鍒犻櫎宸茶繃鏈熸椂闂� */ private void removeOverdue() { - if(1>0) + if (1 > 0) return; - + List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue(); if (list == null || list.size() == 0) { return; @@ -2490,7 +2526,7 @@ * 鍒犻櫎鍟嗗搧宸蹭笅鏋�-鍗曞搧 */ private void removeDownGoods() { - if(1>0) + if (1 > 0) return; try { List<GoodsEvaluate> list = goodsEvaluateDao.removeDownGoods(); @@ -2505,4 +2541,15 @@ e.printStackTrace(); } } + + + @Override + public GoodsEvaluate queryExistSingle(String goodsId, int goodsType) { + List<GoodsEvaluate> list = goodsEvaluateDao.queryExistSingle(goodsType, goodsId); + if (list != null && list.size() > 0) + return list.get(0); + return null; + } + + } -- Gitblit v1.8.0