From aef1627c767ef3cb697973137843617bf4b943b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 四月 2020 10:26:04 +0800
Subject: [PATCH] 增加禁止用户等级升级名单
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 78 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 14 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 c78bd7d..2b168ac 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
@@ -54,6 +54,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
@@ -89,6 +90,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -111,6 +115,28 @@
@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;
+ } else {
+ state = 0;
+ }
+ goodsEvaluateDao.updateSatate(id, state);
+ }
+
+
@Override
public String saveHead(MultipartFile file, GoodsEvaluate record) throws GoodsEvaluateException {
Integer state = record.getState();
@@ -362,7 +388,7 @@
GoodsDetailVO goodsDetailVO = null;
JDGoods jdGoods = null;
PDDGoodsDetail pddGoods = null;
- ConfigParamsDTO params = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
try {
@@ -445,7 +471,7 @@
lineNum = 1;
} else if (totalImg == 3) {
lineNum = 3;
- } else if (totalImg <= 4) {
+ } else if (totalImg == 2 || totalImg == 4) {
lineNum = 2;
} else {
lineNum = 3;
@@ -584,7 +610,7 @@
public GoodsDetailVO getGoodsDetailVO(Long goodsId, Integer goodsType) throws GoodsEvaluateException {
GoodsDetailVO goodsDetail = null;
- ConfigParamsDTO params = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
try {
@@ -780,7 +806,7 @@
lineNum = 1;
} else if (totalImg == 3) {
lineNum = 3;
- } else if (totalImg <= 4) {
+ } else if (totalImg == 2 || totalImg == 4) {
lineNum = 2;
} else {
lineNum = 3;
@@ -1086,7 +1112,7 @@
lineNum = 1;
} else if (totalImg == 3) {
lineNum = 3;
- } else if (totalImg <= 4) {
+ } else if (totalImg == 2 || totalImg == 4) {
lineNum = 2;
} else {
lineNum = 3;
@@ -1276,7 +1302,7 @@
lineNum = 1;
} else if (totalImg == 3) {
lineNum = 3;
- } else if (totalImg <= 4) {
+ } else if (totalImg == 2 || totalImg == 4) {
lineNum = 2;
} else {
lineNum = 3;
@@ -1488,6 +1514,8 @@
// 鍒犻櫎宸茶繃鏈�
removeOverdue();
+
+ removeDownGoods();
}
});
@@ -1655,6 +1683,8 @@
// 鍒犻櫎宸茶繃鏈�
removeOverdue();
+
+ removeDownGoods();
}
});
@@ -1681,7 +1711,7 @@
try {
Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- ConfigParamsDTO params = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
for (GoodsEvaluate goodsEvaluate : list) {
// 鏄惁2涓皬鏃朵箣鍐呭凡鏇存柊
@@ -1836,7 +1866,7 @@
imgs.addAll(goodsBrief.getImgList());
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
@@ -1903,7 +1933,7 @@
lineNum = 1;
} else if (imgList.size() == 3) {
lineNum = 3;
- } else if (imgList.size() <= 4) {
+ } else if (imgList.size() == 2 || imgList.size() == 4) {
lineNum = 2;
} else {
lineNum = 3;
@@ -1977,7 +2007,7 @@
return false;
}
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
// 鍙戝竷鐢ㄦ埛
@@ -2131,7 +2161,7 @@
lineNum = 1;
} else if (imgList.size() == 3) {
lineNum = 3;
- } else if (imgList.size() <= 4) {
+ } else if (imgList.size() == 2 || imgList.size() == 4) {
lineNum = 2;
} else {
lineNum = 3;
@@ -2202,7 +2232,7 @@
return;
}
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
@@ -2222,7 +2252,7 @@
return;
}
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
@@ -2239,7 +2269,7 @@
return;
}
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
updateGoods(queryExist, goodsNew);
@@ -2343,6 +2373,9 @@
}
+ /**
+ * 鍒犻櫎宸茶繃鏈熸椂闂�
+ */
private void removeOverdue() {
List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
if (list == null || list.size() == 0) {
@@ -2364,4 +2397,21 @@
}
}
+ /**
+ * 鍒犻櫎鍟嗗搧宸蹭笅鏋�-鍗曞搧
+ */
+ private void removeDownGoods() {
+ try {
+ List<GoodsEvaluate> list = goodsEvaluateDao.removeDownGoods();
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ for (GoodsEvaluate goodsEvaluate : list) {
+ goodsEvaluateDao.remove(goodsEvaluate);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0