From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 03 十二月 2019 12:30:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java | 81 ++++++++++++++++++++++++++-------------- 1 files changed, 53 insertions(+), 28 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java index cf3a74e..f8e17aa 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java @@ -4,28 +4,28 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Random; import javax.annotation.Resource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.yeshi.fanli.entity.taobao.ShareHotGoods; import com.yeshi.fanli.entity.taobao.TLJBuyGoods; +import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig; import com.yeshi.fanli.entity.taobao.TaoKeAppInfo; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.log.LogHelper; -import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService; import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService; +import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService; import com.yeshi.fanli.util.Constant; -import com.yeshi.fanli.util.TaoBaoConstant; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; @@ -35,9 +35,6 @@ @Resource private UserTaoLiJinReportService userTaoLiJinReportService; - - @Resource - private ShareHotGoodsService shareHotGoodsService; @Resource private TLJBuyGoodsService tljBuyGoodsService; @@ -54,28 +51,10 @@ @Resource private UserTaoLiJinOriginService userTaoLiJinOriginService; - /** - * 姣忓ぉ鍑屾櫒杩�5鍒嗛挓楠岃瘉 - */ - @Scheduled(cron = "0 2 0 * * ?") - public void updateShareTLJGoods() { - if (!Constant.IS_TASK) - return; - LogHelper.test("楠岃瘉鐖嗘鍟嗗搧搴撳晢鍝�"); - String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"); - List<ShareHotGoods> list = shareHotGoodsService.listByDay(day, 15); - int count = 0; - for (int i = 0; i < list.size(); i++) { - if (count >= 10) - break; - boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(), - new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET, - TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT)); - if (success) { - count++; - } - } - } + @Resource + private TLJFreeBuyGoodsService tljFreeBuyGoodsService; + + /** * 姣忓ぉ鍑屾櫒5鐐硅繃10鍒嗛挓楠岃瘉 @@ -169,4 +148,50 @@ addTLJBuyGoods(list, day); } + + /** + * 姣忓ぉ鍑屾櫒23鐐硅繃1鍒嗗紑濮嬬埇鍙� + */ + @Scheduled(cron = "0 1 23 * * ? ") + public void autoAddTLJFreeBuyGoods() { + if (!Constant.IS_TASK) + return; + + String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"); + LogHelper.test("鍏嶅崟鍟嗗搧寮�濮嬮�夊搧" + day); + + // 鏄惁宸查閫� + List<TLJFreeBuyGoods> listSelect = tljFreeBuyGoodsService.listByDay(day); + if (listSelect != null && listSelect.size() > 0) + return; + + int count = 0; + int maxCount = 10; + for (int page = 1; page <= 10; page ++) { + List<TaoBaoGoodsBrief> list = tljFreeBuyGoodsService.listPreGoods("", page); + if (list == null || list.size() == 0) + break; + + while (list.size() > 0) { + if (count >= maxCount) + break; + + Random random = new Random(); + int n = random.nextInt(list.size()); + TaoBaoGoodsBrief goods = list.get(n); + if (goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) { + BigDecimal couplePrice = TaoBaoUtil.getAfterUseCouplePrice(goods); + if (couplePrice.compareTo(new BigDecimal(1.0)) >= 0 && couplePrice.compareTo(new BigDecimal(2.0)) <= 0) { + tljFreeBuyGoodsService.addGoods(new TLJFreeBuyGoods(day, goods)); + count ++; + } + } + list.remove(n); + } + + if (count >= maxCount) + break; + } + + } } -- Gitblit v1.8.0