From 2b82f0694b9d0487cccc135852a49f7da3e2ecba Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 14 五月 2019 17:57:49 +0800
Subject: [PATCH] 品牌优化+ 昵称敏感词验证
---
fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 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 e24c7ce..bf29ca0 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;
/**
* 鑾峰彇鍝佺墝鍒嗙被
@@ -274,17 +274,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());
}
@@ -304,12 +300,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();
@@ -327,7 +318,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