From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容

---
 fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java |   56 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 27 insertions(+), 29 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 1c642bd..f74bd70 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -1,31 +1,10 @@
 package com.yeshi.fanli.job;
 
-import java.math.BigDecimal;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import com.yeshi.fanli.entity.SystemEnum;
-import com.yeshi.fanli.entity.SystemFunction;
-import com.yeshi.fanli.service.manger.goods.tb.DaTaoKeTipOffManager;
-import com.yeshi.fanli.util.SystemInfoUtil;
-import com.yeshi.fanli.util.taobao.DaTaoKeTipOffUtil;
-import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeListTopOffDTO;
-import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeResult;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.yeshi.utils.DateUtil;
-
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
-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.SystemEnum;
+import com.yeshi.fanli.entity.SystemFunction;
 import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
 import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
@@ -35,8 +14,6 @@
 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.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;
@@ -50,13 +27,32 @@
 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.goods.facade.utils.taobao.DaTaoKeApiUtil;
+import com.yeshi.fanli.util.SystemInfoUtil;
 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.goods.facade.utils.taobao.HaoDanKuApiUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeGoodsResult;
+import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeListTopOffDTO;
+import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeResult;
+import com.yeshi.goods.facade.dto.taobao.haodanku.HDKGoodsListResultDTO;
+import com.yeshi.goods.facade.dto.taobao.haodanku.HDKWXCircleContentDTO;
+import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.goods.facade.entity.taobao.haodanku.HDKGoodsDetail;
+import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
+import com.yeshi.goods.facade.utils.taobao.HaoDanKuApiUtil;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.yeshi.utils.DateUtil;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Component
 public class DynamicInfoJob {
@@ -342,7 +338,7 @@
                                         hongBaoManageService.getShareRate(SystemEnum.blks), null,
                                         hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, SystemEnum.blks))));
                 picture.setGoodState(0);
-                picture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
+                picture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail",SystemEnum.blks));
                 picture.setParams(null);
                 picture.setUrl(jdGoods.getPicUrl());
                 imgs.add(picture);
@@ -542,6 +538,7 @@
     @XxlJob("dynamic-tejia-updateBetterGoods")
     public ReturnT<String> updateTejiaBetterGoods(String param) throws Exception {
         addDTKTipOffList(SystemEnum.yhqjx);
+        addDTKTipOffList(SystemEnum.hsb);
         return ReturnT.SUCCESS;
     }
 
@@ -555,8 +552,9 @@
         DaTaoKeResult result = DaTaoKeApiUtil.listTipOff(4, null, 50);
         if (result != null) {
             List<DaTaoKeListTopOffDTO> list = (List<DaTaoKeListTopOffDTO>) result.getList();
-            for (DaTaoKeListTopOffDTO dto : list) {
+            for (int i = list.size() - 1; i >= 0; i--) {
                 try {
+                    DaTaoKeListTopOffDTO dto = list.get(i);
                     List<ActivityRuleUser> ruleList = activityUserService
                             .listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);
                     ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();

--
Gitblit v1.8.0