From 62a447d89331aee1feae7724c7616aa1bb2cfe79 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 16 十月 2024 14:28:37 +0800 Subject: [PATCH] 将CMQ替换为rabbitmq --- fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java | 92 +++++++++++++++++++++++++++++++-------------- 1 files changed, 63 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 62dfb21..6eebec6 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java @@ -1,27 +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.util.SystemInfoUtil; -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.ConfigParamsDTO; -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.dto.GoodsMoneyConfigParamsDTO; +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; @@ -31,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; @@ -46,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 { @@ -320,7 +320,7 @@ desc = desc.replaceFirst("\\[閾炬帴\\]", link); } - desc = convertLinkManager.convertJDLinkFromText(desc, 0L, true,false); + desc = convertLinkManager.convertJDLinkFromText(SystemEnum.blks, desc, 0L, true, false); info.setContent(desc); List<JDGoods> goodsList = JDApiUtil.queryGoodsDetail(goods.getSkuList()); @@ -334,11 +334,11 @@ totalMoney = totalMoney.add(money); picture.setGoodsVO( GoodsDetailVOFactory.convertJDGoods(jdGoods, - new ConfigParamsDTO(hongBaoManageService.getFanLiRate(SystemEnum.blks), + new GoodsMoneyConfigParamsDTO(hongBaoManageService.getFanLiRate(SystemEnum.blks), 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); @@ -400,8 +400,10 @@ for (SystemEnum system : SystemEnum.values()) { if (!SystemInfoUtil.hasFunctions(system, SystemFunction.faQuan)) continue; + if(system!=SystemEnum.blks) + continue; // 濂藉崟搴� - boolean addResult = addHDKListSelected(system); + boolean addResult = false;//addHDKListSelected(system); // 澶ф窐瀹㈠鐢� if (!addResult) { addDTKFriendsFircleList(system); @@ -477,7 +479,7 @@ while (result.getGoodsList() != null && result.getGoodsList().size() > 0) { for (DaTaoKeDetailV2 detailV2 : result.getGoodsList()) { try { - Long goodsId = detailV2.getGoodsId(); + String goodsId = detailV2.getGoodsId(); String circleText = detailV2.getCircleText(); if (circleText == null) { @@ -534,4 +536,36 @@ return addResult; } + + @XxlJob("dynamic-tejia-updateBetterGoods") + public ReturnT<String> updateTejiaBetterGoods(String param) throws Exception { + addDTKTipOffList(SystemEnum.yhqjx); + addDTKTipOffList(SystemEnum.hsb); + return ReturnT.SUCCESS; + } + + /** + * 澶ф窐瀹㈢嚎鎶� + * + * @param system + * @return + */ + private void addDTKTipOffList(SystemEnum system) { + DaTaoKeResult result = DaTaoKeApiUtil.listTipOff(null, null, 50); + if (result != null) { + List<DaTaoKeListTopOffDTO> list = (List<DaTaoKeListTopOffDTO>) result.getList(); + 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(); + goodsEvaluateService.addGoodsEvaluate(dto, user, system); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } -- Gitblit v1.8.0