From 3be3f6e670d2e11d7ced76b8202f0ef30b56870f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 10:54:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java | 64 ++++++++++++-------------------
1 files changed, 25 insertions(+), 39 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 2ff7f31..3459a68 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
@@ -18,7 +18,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;
-import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
@@ -26,8 +25,8 @@
import com.yeshi.fanli.service.inter.brand.BrandClassService;
import com.yeshi.fanli.service.inter.brand.BrandClassShopService;
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.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -57,8 +56,9 @@
@Resource
private HongBaoManageService manageService;
+
@Resource
- private QualityGoodsService qualityGoodsService;
+ private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
/**
* 鑾峰彇鍝佺墝鍒嗙被
@@ -85,26 +85,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();
- }
- }
/**
@@ -138,6 +118,15 @@
@RequestMapping(value = "getHistory", method = RequestMethod.POST)
public void getHistory(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
try {
+ if (type == null) {
+ out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
+ return;
+ }
+
+ if (page == null || page < 1) {
+ page = 1;
+ }
+
int pageSize;
if (type == 1) {
pageSize = 4;
@@ -187,7 +176,7 @@
}
JSONObject data = new JSONObject();
- data.put("count", list.size());
+ data.put("count", count);
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
out.print(JsonUtil.loadTrueResult(data));
@@ -226,11 +215,17 @@
@RequestMapping(value = "getShopInfo", method = RequestMethod.POST)
public void getShopInfo(AcceptData acceptData, Integer page, Long sid, Long uid, PrintWriter out) {
try {
+ if (sid == null) {
+ out.print(JsonUtil.loadFalseResult("缂哄け搴楅摵id"));
+ return;
+ }
+
JSONObject data = new JSONObject();
if (page == 1) {
TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(sid);
if (taoBaoShop == null) {
out.print(JsonUtil.loadFalseResult("搴楅摵淇℃伅鑾峰彇澶辫触"));
+ return;
}
String shopLink = taoBaoShop.getShopLink();
if (StringUtil.isNullOrEmpty(shopLink)) {
@@ -246,7 +241,7 @@
if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
taoBaoShop.setShopIcon(shopIconCustom);
}
- data.put("shop", taoBaoShop);
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(taoBaoShop));
ThreadUtil.run(new Runnable() {
@@ -259,17 +254,13 @@
}
int pageSize = Constant.PAGE_SIZE;
- List<QualityFactory> listQuery = qualityGoodsService.listByShopId((page - 1) * pageSize, pageSize, sid);
+ List<TaoBaoGoodsBrief> listGoods = taoBaoGoodsBriefService.listByShopId((page - 1) * pageSize, pageSize, sid);
long count = 0;
JSONArray array = new JSONArray();
- if (listQuery != null && listQuery.size() > 0) {
+ if (listGoods != null && listGoods.size() > 0) {
List<Long> listGid = new ArrayList<Long>();
- for (QualityFactory qualityFactory : listQuery) {
- TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();
- if (taoBaoGoodsBrief == null) {
- continue;
- }
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {
listGid.add(taoBaoGoodsBrief.getAuctionId());
}
@@ -289,12 +280,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal proportion = manageService.getFanLiRate();
- for (QualityFactory selectionGoods : listQuery) {
- TaoBaoGoodsBrief taoBaoGoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
- if (taoBaoGoodsBrief == null) {
- continue;
- }
-
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
boolean stateSale = false; // 榛樿鍋滃敭
Long goodsId = taoBaoGoodsBrief.getAuctionId();
@@ -312,7 +298,7 @@
}
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
- count = qualityGoodsService.countByShopId(sid);
+ count = taoBaoGoodsBriefService.countByShopId(sid);
}
data.put("count", count);
data.put("list", array);
--
Gitblit v1.8.0