From 2b0d0fd1398e2afa96d8ddf919d8b814c9cb92e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 16:54:15 +0800
Subject: [PATCH] 好单库商品+云发单规则调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 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 c1dda2a..f532b96 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
@@ -33,6 +33,7 @@
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.ActivityRuleUser;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
@@ -1425,6 +1426,11 @@
return goodsEvaluateDao.listByStartTime(date);
}
+ @Override
+ public List<GoodsEvaluate> queryValidSortASC(int start, int count, EvaluateEnum tyepEnum, boolean sortDesc) {
+ return goodsEvaluateDao.queryValidSortASC(start, count, tyepEnum, sortDesc);
+ }
+
@Override
public void saveComment(String pid, CommentInfo commentInfo) throws GoodsEvaluateException {
@@ -1927,9 +1933,11 @@
throw new GoodsEvaluateException(1, "鐩稿叧鍙傛暟涓嶈兘涓虹┖");
}
- List<GoodsEvaluate> evaluateList = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId);
+ Date limitDate = DateUtil.reduceDay(new Date(), 7);
+
+ List<GoodsEvaluate> evaluateList = goodsEvaluateDao.queryExistLimitTime(Constant.SOURCE_TYPE_TAOBAO, goodsId, limitDate);
if (evaluateList != null && evaluateList.size() > 0)
- return;
+ throw new GoodsEvaluateException(1, "璇ュ晢鍝佸凡瀛樺湪");
TaoBaoGoodsBrief goodsBrief = null;
try {
@@ -1949,9 +1957,6 @@
// 鐧藉簳鍥�
List<String> imgs = new ArrayList<>();
- if (!StringUtil.isNullOrEmpty(goodsBrief.getPictUrlWhite())) {
- imgs.add(goodsBrief.getPictUrlWhite());
- }
imgs.addAll(goodsBrief.getImgList());
// 鍟嗗搧VO
@@ -1961,7 +1966,10 @@
// 鍟嗗搧鍥剧墖淇℃伅
int i = 0;
- if (imgList == null || imgList.size() == 0)
+ if (imgList == null)
+ imgList = new ArrayList<ImgInfo>();
+
+ if (imgList.size() == 0)
for (String img : imgs) {
ImgInfo imgInfo = new ImgInfo();
imgInfo.setH(1);
@@ -2078,15 +2086,24 @@
}
for (int i = 0; i < list.size(); i++) {
- boolean cerateGoods = cerateGoods(list.get(i));
+ boolean cerateGoods = addByDaTaoKeGoods(list.get(i));
if (cerateGoods) {
break;
}
}
}
- private boolean cerateGoods(DaTaoKeDetailV2 daTaoKe) {
+
+ @Override
+ public boolean addByDaTaoKeGoods(DaTaoKeDetailV2 daTaoKe) {
try {
+ Date limitDate = DateUtil.reduceDay(new Date(), 7);
+
+ List<GoodsEvaluate> evaluateList = goodsEvaluateDao.queryExistLimitTime(Constant.SOURCE_TYPE_TAOBAO,
+ daTaoKe.getGoodsId()+"", limitDate);
+ if (evaluateList != null && evaluateList.size() > 0)
+ return false;
+
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(daTaoKe.getGoodsId());
if (goodsBrief == null) {
return false;
@@ -2100,8 +2117,15 @@
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
- // 鍙戝竷鐢ㄦ埛
- ActivityUser user = activityUserService.getRandomByDaTaoKeCid(daTaoKe.getCid());
+
+ ActivityUser user = null;
+ if(daTaoKe.getCid() != null) {
+ user = activityUserService.getRandomByDaTaoKeCid(daTaoKe.getCid());
+ } else {
+ List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
+ user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
+ }
+
String desc = daTaoKe.getDesc().replace(",", "锛�");
String[] split = desc.split("锛�");
@@ -2143,7 +2167,6 @@
goodsEvaluate.setState(1);
goodsEvaluate.setDynamicType(1);
goodsEvaluate.setType(EvaluateEnum.single);
-
goodsEvaluate.setShareNum((int) (Math.random() * 5000) + 1000);
goodsEvaluate.setShareNumReal(0);
goodsEvaluate.setWeight(0.0);
@@ -2156,9 +2179,6 @@
List<String> goodsimgs = goodsBrief.getImgList();
List<String> imgs = new ArrayList<>();
- if (!StringUtil.isNullOrEmpty(goodsBrief.getPictUrlWhite())) {
- imgs.add(goodsBrief.getPictUrlWhite());
- }
imgs.addAll(goodsimgs);
int i = 0;
--
Gitblit v1.8.0