From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index a177009..205a4d5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -26,6 +26,7 @@
import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
import com.yeshi.fanli.util.Constant;
@@ -64,6 +65,9 @@
@Resource
private DaTaoKeGoodsService daTaoKeGoodsService;
+ @Resource
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
/**
* 搴楅摵鍒楄〃
*
@@ -83,7 +87,8 @@
* 搴楅摵瓒宠抗
*
* @param acceptData
- * @param type 绮鹃��1锛� 瓒宠抗鍒楄〃2
+ * @param type
+ * 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
@RequestMapping(value = "getHistory", method = RequestMethod.POST)
@@ -155,7 +160,6 @@
JSONObject data = new JSONObject();
data.put("count", count);
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
-
out.print(JsonUtil.loadTrueResult(data));
}
@@ -275,6 +279,9 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ // 鍟嗗搧淇℃伅杩囨护
+ listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
+
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
boolean stateSale = false; // 榛樿鍋滃敭
@@ -299,6 +306,8 @@
data.put("count", array.size());
data.put("list", array);
out.print(JsonUtil.loadTrueResult(data));
+ // 娣诲姞鍒版洿鏂板垪琛�
+ taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
}
}
--
Gitblit v1.8.0