From 7a40d9ca41da29aee9464f545e10b452a1922c32 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期四, 12 三月 2020 11:17:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 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 415c687..5e2f0ca 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
@@ -1465,6 +1465,45 @@
return goodsEvaluateDao.count(key, state, dynamicType);
}
+
+ @Override
+ public void addRanDomShareCount() {
+ // 鍙戝湀
+ try {
+ List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 1);
+ if (list != null) {
+ for (GoodsEvaluate goodsEvaluate: list) {
+ Integer shareNum = goodsEvaluate.getShareNum();
+ if (shareNum == null) {
+ shareNum = 0;
+ }
+ goodsEvaluate.setShareNum(shareNum + (int) (Math.random() * 100) + 10);
+ goodsEvaluateDao.save(goodsEvaluate);
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
+ // 绱犳潗
+ try {
+ List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 2);
+ if (list != null) {
+ for (GoodsEvaluate goodsEvaluate: list) {
+ Integer shareNum = goodsEvaluate.getShareNum();
+ if (shareNum == null) {
+ shareNum = 0;
+ }
+ goodsEvaluate.setShareNum(shareNum + (int) (Math.random() * 100) + 10);
+ goodsEvaluateDao.save(goodsEvaluate);
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+
@Override
@Cacheable(value = "dynamicCache", key = "'queryValidEvaluateCache-'+#start")
public List<GoodsEvaluate> queryValidEvaluateCache(int start, int count) {
@@ -1487,7 +1526,7 @@
}
@Override
-// @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
+ @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
public List<GoodsEvaluate> queryMaterialsCache(int start, int count, int type) throws Exception {
List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, type);
if (list == null) {
@@ -2214,6 +2253,7 @@
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
+
updateGoods(queryExist, goodsNew);
}
@@ -2240,7 +2280,12 @@
GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods();
if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null
&& goodsDetailVO.getGoodsId() == goodsId && goodsDetailVO.getGoodsType() == goodsType ) {
- goodsEvaluate.setGoods(goodsNew);
+ if (goodsDetailVO.getTitle().equalsIgnoreCase(goodsNew.getTitle())) {
+ goodsEvaluate.setGoods(goodsNew);
+ } else {
+ goodsEvaluate.setState(1);
+ goodsEvaluate.setRemarks("鍟嗗搧鏍囬鍙戠敓鍙樺寲涓嬫灦锛�" + goodsDetailVO.getTitle() +" / 鏂帮細" + goodsNew.getTitle());
+ }
}
// 鏇存柊鍟嗗搧淇℃伅
@@ -2251,11 +2296,21 @@
for (ImgInfo imgInfo : imgList) {
SimpleGoods simpleGoods = imgInfo.getGoods();
- if (simpleGoods == null) {
+ if (simpleGoods == null || simpleGoods.getGoodsId() != goodsId
+ || goodsType != simpleGoods.getGoodsType()) {
continue;
}
- simpleGoods.setState(0);
+ GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
+ if (goodsVO != null) {
+ if (goodsVO.getTitle().equalsIgnoreCase(goodsNew.getTitle())) {
+ simpleGoods.setState(0);
+ } else {
+ simpleGoods.setState(1);
+ simpleGoods.setRemarks("鍟嗗搧鏍囬鍙戠敓鍙樺寲涓嬫灦锛�" + goodsVO.getTitle() +" / 鏂帮細" + goodsNew.getTitle());
+ }
+ }
+
simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
if (couponInfo == null) {
--
Gitblit v1.8.0