From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
index a407466..6c771ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,13 +43,14 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.LabelClassService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -167,13 +169,15 @@
// 杞挱鍥�
List<SwiperPicture> picList = null;
if (swpid != null) {
- picList = swiperPictureService.getByBannerId(swpid);
+ picList = swiperPictureService.getByBannerId(swpid, acceptData.getPlatform(),
+ Integer.parseInt(acceptData.getVersion()));
}
if (picList == null) {
picList = new ArrayList<SwiperPicture>();
}
- List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1);
+ List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1,
+ Calendar.getInstance().get(Calendar.MONTH) + 1);
if (goodsSubClassList == null) {
goodsSubClassList = new ArrayList<GoodsSubClass>();
}
@@ -664,6 +668,7 @@
GoodsClass goodsClass = goodsClassService.getGoodsClassCache(gcid);
if (goodsClass == null) {
out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鍒嗙被"));
+ return;
}
if (page < 1)
@@ -676,7 +681,7 @@
long counttotal = 5000;
// 绮鹃�夊簱鏁版嵁涓虹┖鏃讹紝缃戠粶杩涜鏌ヨ
- if (listQuery == null || listQuery.size() == 0) {
+ if (listQuery == null || listQuery.size() == 0 || listQuery.size() < 10) {
long count = qualityGoodsService.countQueryClassId(gcid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
page = page - totalPage;
@@ -791,7 +796,7 @@
if (id == null)
return;
page = page < 1 ? 1 : page;
- String key = String.format("getCouponListByClass-%s-%s", id + "", page + "");
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.couponByClass, id + "-" + page);
String resultStr = "";
if (Constant.IS_OUTNET)
@@ -824,9 +829,16 @@
meterialId = 0;
if (meterialId > 0)
result = TaoKeApiUtil.getMaterialByMaterialId(meterialId, page, 20);
- else
- result = TaoKeApiUtil.searchCouple(goodsClassService.getKeysById(id), null, page, 20);
+ else {
+ SearchFilter sf = new SearchFilter();
+ sf.setPage(page);
+ sf.setPageSize(20);
+ sf.setQuan(1);
+ sf.setKey(goodsClassService.getKeysById(id));
+ result = TaoKeApiUtil.searchWuLiao(sf);
+
+ }
List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();
if (result != null && result.getNavList() != null)
navList.addAll(result.getNavList());
--
Gitblit v1.8.0