From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 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 cee1790..1c26eb7 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
@@ -427,8 +427,8 @@
GoodsDetailVO goodsDetailVO = null;
JDGoods jdGoods = null;
PDDGoodsDetail pddGoods = null;
- ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
try {
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(Long.parseLong(goodsId));
@@ -647,10 +647,10 @@
return commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
}
- public GoodsDetailVO getGoodsDetailVO(Long goodsId, Integer goodsType) throws GoodsEvaluateException {
+ public GoodsDetailVO getGoodsDetailVO(Long goodsId, Integer goodsType, SystemEnum system) throws GoodsEvaluateException {
GoodsDetailVO goodsDetail = null;
- ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
try {
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
@@ -758,7 +758,7 @@
for (int i = 0; i < goodsArray.length && i < 9; i++) {
String goodsids = goodsArray[i];
String[] g = goodsids.split("-");
- GoodsDetailVO goodsDetailVO = getGoodsDetailVO(Long.parseLong(g[0]), Integer.parseInt(g[1]));
+ GoodsDetailVO goodsDetailVO = getGoodsDetailVO(Long.parseLong(g[0]), Integer.parseInt(g[1]), resultObj.getSystem());
if (goodsDetailVO == null) {
continue;
}
@@ -1638,7 +1638,7 @@
}
@Override
- @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
+ @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type+'-'+#system")
public List<GoodsEvaluate> queryMaterialsCache(int start, int count, int type, SystemEnum system) throws Exception {
List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, type, system);
if (list == null) {
@@ -1821,9 +1821,10 @@
try {
Date now = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+
for (GoodsEvaluate goodsEvaluate : list) {
+ ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", goodsEvaluate.getSystem());
+ params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(goodsEvaluate.getSystem()));
// 鏄惁2涓皬鏃朵箣鍐呭凡鏇存柊
Date updateTime = goodsEvaluate.getUpdateTime();
if (updateTime != null) {
@@ -1976,8 +1977,8 @@
imgs.addAll(goodsBrief.getImgList());
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
// 鍟嗗搧鍥剧墖淇℃伅
@@ -2076,6 +2077,7 @@
goodsEvaluate.setLineNum(lineNum);
goodsEvaluate.setImgList(imgList);
goodsEvaluate.setComments(commentsNew);
+ goodsEvaluate.setSystem(system);
goodsEvaluateDao.save(goodsEvaluate);
}
@@ -2100,8 +2102,8 @@
}
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
// 鍟嗗搧鍥剧墖淇℃伅
@@ -2230,6 +2232,7 @@
goodsEvaluate.setLineNum(lineNum);
goodsEvaluate.setImgList(imgList);
goodsEvaluate.setComments(commentsNew);
+ goodsEvaluate.setSystem(system);
goodsEvaluateDao.save(goodsEvaluate);
return result;
}
@@ -2286,8 +2289,8 @@
return false;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
ActivityUser user = null;
@@ -2347,6 +2350,7 @@
goodsEvaluate.setPublishTime(new Date());
goodsEvaluate.setCreateTime(new Date());
goodsEvaluate.setUpdateTime(new Date());
+ goodsEvaluate.setSystem(system);
List<String> goodsimgs = goodsBrief.getImgList();
@@ -2515,8 +2519,8 @@
if (queryExist == null || queryExist.size() == 0) {
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
}
@@ -2537,8 +2541,8 @@
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
updateGoods(queryExist, goodsNew);
@@ -2556,8 +2560,8 @@
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
updateGoods(queryExist, goodsNew);
}
@@ -2575,8 +2579,8 @@
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
}
@@ -2593,18 +2597,18 @@
if (queryExist == null || queryExist.size() == 0) {
continue;
}
-
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
- paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
}
}
private void updateGoods(List<GoodsEvaluate> listExist, GoodsDetailVO goodsNew) {
- String goodsId = goodsNew.getGoodsId();
- int goodsType = goodsNew.getGoodsType();
for (GoodsEvaluate goodsEvaluate : listExist) {
+ String goodsId = goodsNew.getGoodsId();
+ int goodsType = goodsNew.getGoodsType();
+
GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods();
if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null && goodsDetailVO.getGoodsId().equalsIgnoreCase(goodsId)
&& goodsDetailVO.getGoodsType() == goodsType) {
@@ -2748,8 +2752,8 @@
@Override
- public GoodsEvaluate queryExistSingle(String goodsId, int goodsType,SystemEnum system) {
- List<GoodsEvaluate> list = goodsEvaluateDao.queryExistSingle(goodsType, goodsId,system);
+ public GoodsEvaluate queryExistSingle(String goodsId, int goodsType, SystemEnum system) {
+ List<GoodsEvaluate> list = goodsEvaluateDao.queryExistSingle(goodsType, goodsId, system);
if (list != null && list.size() > 0)
return list.get(0);
return null;
--
Gitblit v1.8.0