From 6d58ee1f52f851a240e946ba863a23c0fd08c292 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 五月 2019 17:16:04 +0800
Subject: [PATCH] 随机动态用户
---
fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java | 85 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java
index bf29ca0..5285b34 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java
@@ -20,6 +20,7 @@
import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.brand.BrandClassService;
@@ -28,6 +29,7 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -60,6 +62,9 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
+ @Resource
+ private DaTaoKeGoodsService daTaoKeGoodsService;
+
/**
* 鑾峰彇鍝佺墝鍒嗙被
*
@@ -85,26 +90,6 @@
}
}
- /**
- * 娣诲姞瓒宠抗
- *
- * @param acceptData
- * @param out
- */
- @RequestMapping(value = "addHistory", method = RequestMethod.POST)
- public void addHistory(AcceptData acceptData, Long sid, Long uid, PrintWriter out) {
- try {
- if (sid == null || sid == 0) {
- out.print(JsonUtil.loadFalseResult("搴楅摵id涓虹┖"));
- return;
- }
-
- out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("璁板綍澶辫触"));
- e.printStackTrace();
- }
- }
/**
@@ -270,20 +255,56 @@
taoBaoShopHistoryService.addHistory(sid, uid, acceptData.getDevice());
}
});
-
}
- int pageSize = Constant.PAGE_SIZE;
- List<TaoBaoGoodsBrief> listGoods = taoBaoGoodsBriefService.listByShopId((page - 1) * pageSize, pageSize, sid);
+
+ // 鍟嗗搧鍒楄〃淇℃伅
+ int pageSize = 50;
+ List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
+
+ // 鍏堟煡璇㈠ぇ娣樺鏁版嵁
+ List<DaTaoKeDetail> listDaTaoKe = daTaoKeGoodsService.listBySellerId(0, pageSize, sid);
+ if (listDaTaoKe != null && listDaTaoKe.size() > 0) {
+ for (DaTaoKeDetail daTaoKe: listDaTaoKe) {
+ listGoodsBrief.add(TaoBaoUtil.convert(daTaoKe));
+ }
+ }
+
+ // 涓嶈冻50鏉℃暟鎹�佹煡璇㈢簿閫夊簱
+ if (listGoodsBrief.size() < pageSize) {
+ int needCount = pageSize- listGoodsBrief.size();
+ List<TaoBaoGoodsBrief> listGoods = taoBaoGoodsBriefService.listByShopId(0, needCount, sid);
+ if (listGoods != null && listGoods.size() > 0) {
+
+ if (listGoodsBrief.size() > 0) {
+ for (int i = 0; i< listGoods.size(); i ++) {
+ long id = listGoods.get(i).getAuctionId();
+ boolean isRepeat = false;
+ for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {
+ long auctionId = goodsBrief.getAuctionId();
+ if (auctionId == id) {
+ isRepeat = true;
+ break;
+ }
+ }
+ if(isRepeat) {
+ listGoods.remove(i);
+ i--;
+ }
+ }
+ }
+
+ listGoodsBrief.addAll(listGoods);
+ }
+ }
+
- long count = 0;
JSONArray array = new JSONArray();
- if (listGoods != null && listGoods.size() > 0) {
+ if (listGoodsBrief.size() > 0) {
List<Long> listGid = new ArrayList<Long>();
- for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
listGid.add(taoBaoGoodsBrief.getAuctionId());
}
-
// API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
List<TaoBaoGoodsBrief> listTaoKeGoods = null;
try {
@@ -295,12 +316,13 @@
} catch (Exception e) {
e.printStackTrace();
}
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
BigDecimal proportion = manageService.getFanLiRate();
- for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {
+
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
boolean stateSale = false; // 榛樿鍋滃敭
Long goodsId = taoBaoGoodsBrief.getAuctionId();
@@ -311,16 +333,15 @@
break;
}
}
-
if (!stateSale) {
continue;
}
}
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
- count = taoBaoGoodsBriefService.countByShopId(sid);
}
- data.put("count", count);
+
+ data.put("count", array.size());
data.put("list", array);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
--
Gitblit v1.8.0