From 54b0dd1b6f8230799b0b4490f8b39afdd53a4e4c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 09:30:57 +0800
Subject: [PATCH] 积分明细
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
index 8d7399d..0878955 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -19,12 +19,11 @@
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
-import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -49,6 +48,9 @@
@Resource
private CommonTemplateContentService commonTemplateContentService;
+
+ @Resource
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
/**
* 閫氱敤妯℃澘瀵艰埅
@@ -89,7 +91,7 @@
}
CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
- cid, page, Constant.PAGE_SIZE);
+ cid, page, 10);
// 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
List<SwiperPicture> bannerList = new ArrayList<>();
@@ -101,6 +103,8 @@
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
BigDecimal pro = hongBaoManageService.getFanLiRate();
+ if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
+ pro = new BigDecimal(100);
List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "")));
@@ -108,6 +112,13 @@
root.put("goodsList", array);
root.put("goodsCount", result.getCount());
out.print(JsonUtil.loadTrueResult(root));
+
+ // 鏇存柊鍓�5椤垫暟鎹�
+ if (page <= 5)
+ try {
+ taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);
+ } catch (Exception e) {
+ }
}
}
--
Gitblit v1.8.0