From 9eeda0d3049b71877c373c04d65533939b5582ef Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 02 九月 2019 09:55:55 +0800 Subject: [PATCH] getBoss方法只查询有效上级信息 --- fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java | 104 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 79 insertions(+), 25 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 c1cbbf7..00e2ebb 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java @@ -10,15 +10,20 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord; import com.yeshi.fanli.entity.taobao.ShareHotGoods; import com.yeshi.fanli.entity.taobao.TLJBuyGoods; 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.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; @@ -40,6 +45,16 @@ @Resource private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService; + + @Resource + private TaoBaoUnionConfigService taoBaoUnionConfigService; + + @Resource + private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService; + + @Resource + private UserTaoLiJinOriginService userTaoLiJinOriginService; + /** * 鏇存柊鎶ュ憡 @@ -99,38 +114,32 @@ } /** - * 姣忓ぉ鍑屾櫒杩�3鍒嗛挓楠岃瘉 + * 姣忓ぉ鍑屾櫒5鐐硅繃10鍒嗛挓楠岃瘉 */ - @Scheduled(cron = "0 3 0 * * ?") + @Scheduled(cron = "0 10 5 * * ? ") public void updateBuyTLJGoods() { if (!Constant.IS_TASK) return; LogHelper.test("楠岃瘉鑷喘绔嬪噺鍟嗗搧"); String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"); - List<TLJBuyGoods> list = tljBuyGoodsService.listByDay(day, 15); - int count = 0; - for (int i = 0; i < list.size(); i++) { - if (count >= 10) - break; - boolean success = tljBuyGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId()); - if (success) { - count++; + List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService + .getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY); + for (TaoBaoUnionConfig app : configList) { + List<TLJBuyGoods> list = tljBuyGoodsService.listByDay(app.getAppKey(), day, 15);// 鑾峰彇鏈�澶�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(app.getAppKey(), app.getAppSecret(), app.getDefaultPid())); + if (success) { + count++; + } } } } - /** - * 姣忓ぉ鏅氫笂11鐐�50娣诲姞娣樼ぜ閲� - */ - @Scheduled(cron = "0 50 23 * * ? ") - public void autoAddTLJBuyGoods() { - if (!Constant.IS_TASK) - return; - String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"); - List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1); - Collections.shuffle(list); - if (list.size() > 20) - list = list.subList(0, 20); + private void addTLJBuyGoods(List<TaoBaoGoodsBrief> list, String day) { for (TaoBaoGoodsBrief goods : list) { // 鑾峰彇鍟嗗搧璇︽儏 try { @@ -140,18 +149,63 @@ } if (goods != null && goods.getCouponAmount() != null && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) { - if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate()) .compareTo(new BigDecimal("143")) >= 0) { goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods); int totalHongBaoCount = 2000 + (int) (Math.random() * 8000); int leftHongBaoCount = 200 + (int) (Math.random() * 2000); tljBuyGoodsService.addTLJBuyGoods( - new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount), - TaoBaoConstant.ownBuyApp); + new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount)); } } } } + /** + * 姣忓ぉ鍑屾櫒5鐐硅繃1鍒嗗紑濮嬬埇鍙栧墿浣�9涓晢鍝� + */ + @Scheduled(cron = "0 1 5 * * ? ") + public void autoAddTLJBuyGoods2() { + if (!Constant.IS_TASK) + return; + String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"); + List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1); + Collections.shuffle(list); + List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService + .getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY); + + if (list.size() > 12 * configList.size()) + list = list.subList(0, 12 * configList.size()); + addTLJBuyGoods(list, day); + } + + + /** + * 姣�2涓皬鏃� 璧犻�侀��鍥炲凡杩囨湡娣樼ぜ閲� + */ + @Scheduled(cron = "0 0 0/2 * * ? ") + public void giveSendBack() { + if (!Constant.IS_TASK) + return; + + for (int i = 0; i < 100; i++) { + List<UserTaoLiJinGiveRecord> overdueList = userTaoLiJinGiveRecordService.overdueList(500); + if (overdueList == null || overdueList.size() == 0) { + break; + } + + for (UserTaoLiJinGiveRecord record: overdueList) { + try { + userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record); + // 鏇存柊璁板綍 + UserTaoLiJinGiveRecord updateRecord = new UserTaoLiJinGiveRecord(); + updateRecord.setId(record.getId()); + updateRecord.setState(UserTaoLiJinGiveRecord.STATE_OVERDUE); + userTaoLiJinGiveRecordService.updateByPrimaryKeySelective(updateRecord); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } } -- Gitblit v1.8.0