From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java | 126 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 66 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 ac946ff..cf3a74e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -13,12 +13,16 @@
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;
@@ -37,43 +41,18 @@
@Resource
private TLJBuyGoodsService tljBuyGoodsService;
-
+
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
- /**
- * 鏇存柊鎶ュ憡
- */
- @Scheduled(cron = "0 0 1,10 * * ?")
- public void insetDynamicInfo() {
+ @Resource
+ private TaoBaoUnionConfigService taoBaoUnionConfigService;
- if (!Constant.IS_TASK) {
- return;
- }
+ @Resource
+ private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;
- try {
- userTaoLiJinReportService.needUpdateReport();
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
-
- /**
- * 閫�鍥炶秴杩�3澶╂棤棰嗗彇鐨勬窐绀奸噾
- */
- @Scheduled(cron = "0 0 1 * * ?")
- public void refundNotWin() {
-
- if (!Constant.IS_TASK) {
- return;
- }
-
- try {
- userTaoLiJinReportService.refundNotWin();
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
+ @Resource
+ private UserTaoLiJinOriginService userTaoLiJinOriginService;
/**
* 姣忓ぉ鍑屾櫒杩�5鍒嗛挓楠岃瘉
@@ -107,18 +86,24 @@
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 = 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++;
+ List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService
+ .getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY);
+ int totalCount = 0;
+ 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 = tljBuyGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),
+ new TaoKeAppInfo(app.getAppKey(), app.getAppSecret(), app.getDefaultPid()));
+ if (success) {
+ count++;
+ }
}
+ totalCount += count;
}
+ LogHelper.test("鑷喘绔嬪噺鍟嗗搧楠岃瘉閫氳繃鐨勬暟閲�:" + totalCount);
}
private void addTLJBuyGoods(List<TaoBaoGoodsBrief> list, String day) {
@@ -132,32 +117,20 @@
if (goods != null && goods.getCouponAmount() != null
&& goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {
+ // 娣樼ぜ閲戠殑閲戦浣嶄簬1-10鍧椾箣闂� 蹇呴』鏄ぉ鐚�
if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())
- .compareTo(new BigDecimal("143")) >= 0) {
+ .compareTo(new BigDecimal("143")) >= 0
+ && TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())
+ .compareTo(new BigDecimal("1430")) <= 0
+ && goods.getUserType() == 1) {
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));
+ }
}
}
- }
-
- /**
- * 姣忓ぉ鏅氫笂11鐐�50娣诲姞娣樼ぜ閲�1涓晢鍝侊紝鐢ㄤ簬鍏煎Android鍓嶇娌℃湁鍟嗗搧涓嶆樉绀篵anner鐨勯棶棰�
- */
- @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() > 0)
- list = list.subList(0, 1);
- addTLJBuyGoods(list, day);
}
/**
@@ -165,13 +138,34 @@
*/
@Scheduled(cron = "0 1 5 * * ? ")
public void autoAddTLJBuyGoods2() {
- if (!Constant.IS_TASK)
- return;
+ // if (!Constant.IS_TASK)
+ // return;
+ LogHelper.test("鑷喘绔嬪噺寮�濮嬮�夊搧");
String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd");
- List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);
+ // 閲嶈瘯3娆�
+ List<TaoBaoGoodsBrief> list = null;
+ try {
+ list = tljBuyGoodsService.listPreGoods(1);
+ } catch (Exception e) {
+ }
+ if (list == null || list.size() == 0)
+ try {
+ list = tljBuyGoodsService.listPreGoods(1);
+ } catch (Exception e) {
+ }
+ if (list == null || list.size() == 0)
+ try {
+ list = tljBuyGoodsService.listPreGoods(1);
+ } catch (Exception e) {
+ }
+
+ LogHelper.test("鑷喘绔嬪噺澶囬�夊晢鍝佹暟閲�:" + list.size());
Collections.shuffle(list);
- if (list.size() > 20)
- list = list.subList(0, 20);
+ 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