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/job/DynamicInfoJob.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
index 68ccd11..78a0d62 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.SystemFunction;
+import com.yeshi.fanli.util.SystemInfoUtil;
import org.apache.commons.lang.StringEscapeUtils;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -334,7 +336,7 @@
GoodsDetailVOFactory.convertJDGoods(jdGoods,
new ConfigParamsDTO(hongBaoManageService.getFanLiRate(SystemEnum.blks),
hongBaoManageService.getShareRate(SystemEnum.blks), null,
- hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,SystemEnum.blks))));
+ hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, SystemEnum.blks))));
picture.setGoodState(0);
picture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
picture.setParams(null);
@@ -394,11 +396,16 @@
*/
@XxlJob("dynamic-insertEvaluate")
public ReturnT<String> insertEvaluate(String param) throws Exception {
- // 濂藉崟搴�
- boolean addResult = addHDKListSelected();
- // 澶ф窐瀹㈠鐢�
- if (!addResult) {
- addDTKFriendsFircleList();
+
+ for (SystemEnum system : SystemEnum.values()) {
+ if (!SystemInfoUtil.hasFunctions(system, SystemFunction.faQuan))
+ continue;
+ // 濂藉崟搴�
+ boolean addResult = addHDKListSelected(system);
+ // 澶ф窐瀹㈠鐢�
+ if (!addResult) {
+ addDTKFriendsFircleList(system);
+ }
}
return ReturnT.SUCCESS;
}
@@ -409,7 +416,7 @@
*
* @return
*/
- private boolean addHDKListSelected() {
+ private boolean addHDKListSelected(SystemEnum system) {
boolean addResult = false;
Integer minId = 1;
while (minId != null) {
@@ -439,7 +446,7 @@
List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
- int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoGoodsFactory.create(hdkGoods), pics, user, showtitle, SystemEnum.blks);
+ int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoGoodsFactory.create(hdkGoods), pics, user, showtitle, system);
if (addProcess == 0) {
addResult = true;
break;
@@ -463,7 +470,7 @@
*
* @return
*/
- private boolean addDTKFriendsFircleList() {
+ private boolean addDTKFriendsFircleList(SystemEnum system) {
boolean addResult = false;
try {
DaTaoKeGoodsResult result = DaTaoKeApiUtil.getFriendsFircleList("1", 100);
@@ -494,7 +501,7 @@
user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
}
- int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoUtil.convert(tkGoods), null, user, showtitle, SystemEnum.blks);
+ int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoUtil.convert(tkGoods), null, user, showtitle, system);
if (addProcess == 0) {
addResult = true;
break;
--
Gitblit v1.8.0