From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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 135c9c4..ccf5fca 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;
@@ -17,9 +19,9 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.ConfigParamsDTO;
-import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
-import com.yeshi.fanli.dto.taobao.haodanku.HDKGoodsListResultDTO;
-import com.yeshi.fanli.dto.taobao.haodanku.HDKWXCircleContentDTO;
+import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeGoodsResult;
+import com.yeshi.goods.facade.dto.taobao.haodanku.HDKGoodsListResultDTO;
+import com.yeshi.goods.facade.dto.taobao.haodanku.HDKWXCircleContentDTO;
import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
@@ -29,8 +31,8 @@
import com.yeshi.fanli.entity.dynamic.WXMPDynamicInfo;
import com.yeshi.fanli.entity.goods.jd.NYouHuiGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
-import com.yeshi.fanli.entity.taobao.haodanku.HDKGoodsDetail;
+import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.goods.facade.entity.taobao.haodanku.HDKGoodsDetail;
import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
@@ -44,12 +46,12 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
+import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.factory.goods.TaoBaoGoodsFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
-import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;
+import com.yeshi.goods.facade.utils.taobao.HaoDanKuApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@Component
@@ -318,7 +320,7 @@
desc = desc.replaceFirst("\\[閾炬帴\\]", link);
}
- desc = convertLinkManager.convertJDLinkFromText(desc, 0L, true);
+ desc = convertLinkManager.convertJDLinkFromText(desc, 0L, true,false);
info.setContent(desc);
List<JDGoods> goodsList = JDApiUtil.queryGoodsDetail(goods.getSkuList());
@@ -328,13 +330,13 @@
List<String> lastPicture = new ArrayList<>();
for (JDGoods jdGoods : goodsList) {
GoodsPicture picture = new GoodsPicture();
- BigDecimal money = JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate());
+ BigDecimal money = JDUtil.getGoodsFanLiMoney(jdGoods, hongBaoManageService.getShareRate(SystemEnum.blks));
totalMoney = totalMoney.add(money);
picture.setGoodsVO(
GoodsDetailVOFactory.convertJDGoods(jdGoods,
- new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
- hongBaoManageService.getShareRate(), null,
- hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));
+ new ConfigParamsDTO(hongBaoManageService.getFanLiRate(SystemEnum.blks),
+ hongBaoManageService.getShareRate(SystemEnum.blks), null,
+ 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