From 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 11:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java b/fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java
index dc1b61a..c151f2a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import org.apache.commons.beanutils.PropertyUtils;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.yeshi.utils.DateUtil;
@@ -18,6 +19,7 @@
import com.yeshi.fanli.entity.goods.PullNewGoods;
import com.yeshi.fanli.entity.taobao.haodanku.HDKGoodsDetail;
import com.yeshi.fanli.service.inter.goods.PullNewGoodsService;
+import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;
@@ -27,6 +29,8 @@
@Resource
private UserRankingsService userRankingsService;
+ @Resource
+ private RedPackConfigService redPackConfigService;
@Resource
private PullNewGoodsService pullNewGoodsService;
@@ -45,10 +49,21 @@
return ReturnT.SUCCESS;
}
+
+ @Scheduled(cron = "0 0/2 * * * ? ")
+ private void addPullNewGoods2() {
+ addPullNewGoods();
+ }
+
/**
* 鎷夋柊鍟嗗搧
*/
private void addPullNewGoods() {
+ // 鍟嗗搧姣斾緥闄愬埗
+ double limitRate = Double.valueOf(redPackConfigService.getValueByKey("goods_reate_limit"));
+ double limitPrice = Double.valueOf(redPackConfigService.getValueByKey("goods_pay_ment_limit"));
+
+
Integer array[] = {3,4,5,6,7,8,9,10,11,12,15};
for (Integer catId: array) {
Integer minId = 1;
@@ -66,13 +81,13 @@
for (HDKGoodsDetail goods : goodsList) {
// 浣ｉ噾姣斾緥澶т簬50%
- if (goods.getTkrates() == null || goods.getTkrates() < 50)
+ if (goods.getTkrates() == null || goods.getTkrates() < limitRate)
continue;
// 鏄惁瀛樺湪鍒�
if (goods.getCouponmoney() == null || goods.getCouponmoney() <= 0)
continue;
// 鍟嗗搧鍒稿悗浠峰ぇ浜�9.9鍏�
- if (goods.getItemendprice() == null || goods.getItemendprice() <= 9.9)
+ if (goods.getItemendprice() == null || goods.getItemendprice() <= limitPrice)
continue;
PullNewGoods pullNewGoods = new PullNewGoods();
--
Gitblit v1.8.0