From 5a80c35e42ba1ed7340097ea9b156016e52a23f2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 17:05:05 +0800
Subject: [PATCH] 京东订单修改
---
fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java | 65 ++++++++++++++++++++------------
1 files changed, 40 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..d4a207a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -13,11 +13,13 @@
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.UserTaoLiJinReportService;
import com.yeshi.fanli.util.Constant;
@@ -40,6 +42,9 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+ @Resource
+ private TaoBaoUnionConfigService taoBaoUnionConfigService;
/**
* 鏇存柊鎶ュ憡
@@ -99,38 +104,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 +139,34 @@
}
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);
+ }
+
}
--
Gitblit v1.8.0