From f100f62dcc2ad20bba7cc3464582162e75d2d2c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 15:48:03 +0800
Subject: [PATCH] 二级分类标签添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java | 426 ++++++++++++++++++++++++++++------------------------
1 files changed, 230 insertions(+), 196 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java
index 9f878fa..14d32c1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java
@@ -8,24 +8,23 @@
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.clazz.ClassRecommendGoods;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
+import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
-import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -33,27 +32,32 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;
import com.yeshi.fanli.service.inter.goods.SuperGoodsClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
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.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
+import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/class")
@@ -64,9 +68,6 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
- @Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
@Resource
private GoodsClassService goodsClassService;
@@ -84,7 +85,7 @@
private HongBaoManageService manageService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private RedisManager redisManager;
@@ -103,6 +104,18 @@
@Resource
private QualityGoodsService qualityGoodsService;
+ @Resource
+ private MonitorService monitorService;
+
+ @Resource
+ private HomeNavbarService homeNavbarService;
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
+
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
/**
* 鑾峰彇涓荤被鐩�
*
@@ -111,26 +124,28 @@
*/
@RequestMapping(value = "getgoodsclass", method = RequestMethod.POST)
public void getGoodsClass(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
+
+ try {
+ List<GoodsClass> goodsClassList = goodsClassService.getEffectiveClassCache();
+ if (goodsClassList == null || goodsClassList.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", goodsClassList.size());
+ data.put("goodsClassList", JsonUtil.getApiCommonGson().toJson(goodsClassList));
+
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
- List<SuperGoodsClass> superGoodsClassList = superGoodsClassService.getSuperGoodsClassBySystemId(system.getId());
- if (superGoodsClassList == null || superGoodsClassList.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
- List<GoodsClass> goodsClassList = new ArrayList<GoodsClass>();
- for (SuperGoodsClass superGoodsClass : superGoodsClassList) {
- GoodsClass goodsClass = superGoodsClass.getGoodsClass();
- goodsClassList.add(goodsClass);
- }
- JSONObject data = new JSONObject();
- data.put("count", goodsClassList.size());
- data.put("goodsClassList", goodsClassList);
- String result = JsonUtil.loadTrueResult(data);
- out.print(result);
+
}
/**
@@ -141,45 +156,81 @@
* @param out
*/
@RequestMapping(value = "getgoodssecondclass", method = RequestMethod.POST)
- public void getGoodsSecondClass(AcceptData acceptData, long gcid, PrintWriter out) {
-
+ public void getGoodsSecondClass(AcceptData acceptData, long gcid, Long swpid, PrintWriter out) {
try {
-
GoodsClass goodsClass = goodsClassService.getGoodsClassCache(gcid);
if (goodsClass == null) {
out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
- Long androidClick = goodsClass.getAndroidClick();
- if (androidClick != null) {
- goodsClass.setAndroidClick(androidClick + 1);
- } else {
- goodsClass.setAndroidClick(1L);
- }
- } else if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
- Long iosClick = goodsClass.getIosClick();
- if (iosClick != null) {
- goodsClass.setIosClick(iosClick + 1);
- } else {
- goodsClass.setIosClick(1L);
- }
+ // 杞挱鍥�
+ List<SwiperPicture> picList = null;
+ if (swpid != null) {
+ picList = swiperPictureService.getByBannerId(swpid);
}
- goodsClassService.updateByPrimaryKeySelective(goodsClass);
-
+ if (picList == null) {
+ picList = new ArrayList<SwiperPicture>();
+ }
+
List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1);
-
- if (goodsSubClassList == null || goodsSubClassList.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
+ if (goodsSubClassList == null) {
+ goodsSubClassList = new ArrayList<GoodsSubClass>();
}
-
+
+ boolean changePicture = false;
+ String version = acceptData.getVersion();
+ int tversion = Integer.parseInt(version);
+ String platform = acceptData.getPlatform();
+ if ("android".equalsIgnoreCase(platform) && tversion > 38) {
+ changePicture = true;
+ } else if (tversion > 47){
+ changePicture = true;
+ }
+
+ // 1.5.3鏂扮増鍥剧墖鏇挎崲
+ if (changePicture) {
+ for (GoodsSubClass goodsSubClass: goodsSubClassList) {
+ String pictureSecond = goodsSubClass.getPictureSecond();
+ if (pictureSecond != null && pictureSecond.trim().length() > 0) {
+ goodsSubClass.setPicture(pictureSecond);
+ }
+ }
+ }
+
JSONObject data = new JSONObject();
+ data.put("picList", JsonUtil.getApiCommonGson().toJson(picList));
data.put("count", goodsSubClassList.size());
data.put("goodsSecondClassList", JsonUtil.getApiCommonGson().toJson(goodsSubClassList));
-
out.print(JsonUtil.loadTrueResult(data));
+
+ // 鏇存柊鍒嗙被鐐瑰嚮娆℃暟
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
+ Long androidClick = goodsClass.getAndroidClick();
+ if (androidClick != null) {
+ goodsClass.setAndroidClick(androidClick + 1);
+ } else {
+ goodsClass.setAndroidClick(1L);
+ }
+ } else if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ Long iosClick = goodsClass.getIosClick();
+ if (iosClick != null) {
+ goodsClass.setIosClick(iosClick + 1);
+ } else {
+ goodsClass.setIosClick(1L);
+ }
+ }
+
+ GoodsClass gc = new GoodsClass();
+ gc.setId(goodsClass.getId());
+ gc.setIosClick(goodsClass.getIosClick());
+ gc.setAndroidClick(goodsClass.getAndroidClick());
+ goodsClassService.updateByPrimaryKeySelective(gc);
+ }
+ });
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -192,20 +243,6 @@
}
- @RequestMapping(value = "getclassrecommendgoods", method = RequestMethod.POST)
- public void getClassRecommendGoods(AcceptData acceptData, long goodsClassId, PrintWriter out) {
- List<ClassRecommendGoods> classRecommendGoodsList = classRecommendGoodsService
- .getClassRecommendGoodsByGoodsClassId(goodsClassId);
- if (classRecommendGoodsList == null) {
- out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
- JSONObject data = new JSONObject();
- data.put("count", classRecommendGoodsList.size());
- data.put("classRecommendGoodsList", JsonUtil.getApiCommonGson().toJson(classRecommendGoodsList));
- String result = JsonUtil.loadTrueResult(data);
- out.print(result);
- }
@RequestMapping(value = "getCouponGoods", method = RequestMethod.POST)
public void getCouponGoods(AcceptData acceptData, int page, long gcid, PrintWriter out) {
@@ -256,7 +293,7 @@
@RequestMapping(value = "getgoods", method = RequestMethod.POST)
public void getGoods(AcceptData acceptData, int page, long scid, String filter, String order, String startprice,
String endprice, String fastFilter, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -320,9 +357,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
JSONArray array = new JSONArray();
List<TaoBaoGoodsBrief> taobaoList = taoKeGoodsService.searchWuLiaoList(sf);
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taobaoList) {
int biz30day = taoBaoGoodsBrief.getBiz30day();
if (biz30day >= 10000) {
@@ -332,7 +367,7 @@
} else {
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
data.put("nav", new JSONArray());
@@ -348,9 +383,11 @@
* @param page
* @param scid
* @param filter
- * @param order 鏉ユ簮锛氥�愭帹鑽愶細0 | 缁煎悎锛�4 銆佺患鍚堝彧鐪嬫湁鍒� 1 銆佺患鍚堝彧鐪嬪ぉ鐚� 1 | 浠锋牸锛氫綆鍒伴珮3 楂樺埌浣�2 | 閿�閲忥細1銆�
- * 鎺掑簭鍊硷細銆愰攢閲忕敱楂樺埌浣�: 1 锛� 閿�閲忕敱浣庡埌楂� 5锛� 浠锋牸浠庨珮鍒颁綆: 2 锛� 浠锋牸浠庝綆鍒伴珮:3 锛� 鎺ㄥ箍閲忛珮鍒颁綆:4 锛� 鍏朵粬榛樿锛� 閿�閲忕敱楂樺埌浣庛��
- *
+ * @param order
+ * 鏉ユ簮锛氥�愭帹鑽愶細0 | 缁煎悎锛�4 銆佺患鍚堝彧鐪嬫湁鍒� 1 銆佺患鍚堝彧鐪嬪ぉ鐚� 1 | 浠锋牸锛氫綆鍒伴珮3 楂樺埌浣�2 | 閿�閲忥細1銆�
+ * 鎺掑簭鍊硷細銆愰攢閲忕敱楂樺埌浣�: 1 锛� 閿�閲忕敱浣庡埌楂� 5锛� 浠锋牸浠庨珮鍒颁綆: 2 锛� 浠锋牸浠庝綆鍒伴珮:3 锛� 鎺ㄥ箍閲忛珮鍒颁綆:4 锛�
+ * 鍏朵粬榛樿锛� 閿�閲忕敱楂樺埌浣庛��
+ *
* @param startprice
* 璧峰浠锋牸
* @param endprice
@@ -364,78 +401,76 @@
@RequestMapping(value = "getsecondclassgoods", method = RequestMethod.POST)
public void getSecondClassGoods(AcceptData acceptData, int page, long scid, String filter, String order,
String startprice, String endprice, String fastFilter, Integer totalSales, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
}
try {
-
+
GoodsSubClass goodsSubClass = goodsSubClassService.getSubClassByPrimaryKeyCache(scid);
if (goodsSubClass == null) {
out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鍒嗙被"));
return;
}
-
+
if (page == 0) {
// 缁熻鐐瑰嚮閲�
goodsSubClassService.countClick(acceptData, goodsSubClass);
}
-
+
/* 鎼滅储鍏抽敭璇� */
String searchKey = goodsSubClass.getName();
String key = goodsSubClass.getKey();
if (key != null && !"".equals(key.trim())) {
searchKey = key;
}
-
+
/* 鍟嗗搧绯荤粺鍒嗙被id */
Long systemCid = null;
GoodsClass rootClass = goodsSubClass.getRootClass();
if (rootClass != null) {
systemCid = rootClass.getId();
}
-
-
+
// page浠�1寮�濮�
page += 1;
// 璇锋眰娣樺疂鎺ュ彛椤电爜
- int pageNo = page;
-
+ int pageNo = page;
+
int pageSize = Constant.PAGE_SIZE;
-
- /* 鏌ヨ鎺ㄨ崘妯″潡 娓呯┖鍏朵粬闈炲繀瑕佺瓫閫夐」鍜屾帓搴忛」 */
+
+ /* 鏌ヨ鎺ㄨ崘妯″潡 娓呯┖鍏朵粬闈炲繀瑕佺瓫閫夐」鍜屾帓搴忛」 */
if (!StringUtil.isNullOrEmpty(order) && Integer.parseInt(order) == 0) {
-
+
// 鍒嗙被鍏宠仈鏍囩id闆嗗悎
- List<Long> listLabId =
- labelClassService.getRelationLabIds((page - 1) * pageSize, pageSize, goodsSubClass.getId());
-
+ List<Long> listLabId = labelClassService.getRelationLabIds((page - 1) * pageSize, pageSize,
+ goodsSubClass.getId());
+
/* 璁＄畻绮鹃�夊簱鏁版嵁 鎬婚〉鏁� */
long incount = taoKeGoodsService.countByQuality(searchKey, systemCid, listLabId);
int totalPage = (int) (incount % pageSize == 0 ? incount / pageSize : incount / pageSize + 1);
-
+
pageNo = page - totalPage;
-
-
+
/* 鏌ヨ绮鹃�夊簱鏁版嵁 */
- if (pageNo <= 0 ) {
-
- List<QualityFactory> listQuality = taoKeGoodsService.queryByQuality((page - 1) * pageSize,
- pageSize,searchKey, systemCid, listLabId);
-
+ if (pageNo <= 0) {
+
+ List<QualityFactory> listQuality = taoKeGoodsService.queryByQuality((page - 1) * pageSize, pageSize,
+ searchKey, systemCid, listLabId);
+
List<TaoBaoGoodsBrief> searchWuLiaoList = null;
-
- /* 绮鹃�夊簱鏁版嵁涓嶈冻10鏉� */
+
+ /* 绮鹃�夊簱鏁版嵁涓嶈冻10鏉� */
if (listQuality != null && listQuality.size() != 0 && listQuality.size() < 10) {
-
+
String searchParam = goodsSubClass.getSearchJson();
-
+
Gson gs = new Gson();
SearchFilter searchfilter = gs.fromJson(searchParam, SearchFilter.class);
-
+
int quanfilter = searchfilter.getQuan();
if (quanfilter != 1) {
searchfilter.setQuan(1);
@@ -445,53 +480,51 @@
if (endPricefilter == null) {
searchfilter.setEndPrice(new BigDecimal(220));
}
-
+
boolean includeGoodRate = searchfilter.isIncludeGoodRate();
if (!includeGoodRate) {
searchfilter.setIncludeGoodRate(true);
}
-
- //璇锋眰绗竴椤垫暟鎹�
+
+ // 璇锋眰绗竴椤垫暟鎹�
searchfilter.setPage(1);
searchfilter.setPageSize(pageSize);
searchfilter.setKey(searchKey);
searchfilter.setMaterialId("6707");
-
+
searchWuLiaoList = taoKeGoodsService.searchWuLiaoList(searchfilter);
}
Map<String, String> map = manageService.convertMap();
-
+
JSONObject data = taoKeGoodsService.listQualityGoods(listQuality, searchWuLiaoList, map);
-
+
out.print(JsonUtil.loadTrueResult(data));
-
+
return;
}
-
-
- if (pageNo > 0 && totalPage > 0) {
- List<QualityFactory> list = taoKeGoodsService.queryByQuality((totalPage - 1) * pageSize,
- pageSize, searchKey, systemCid, listLabId);
-
+
+ if (pageNo > 0 && totalPage > 0) {
+ List<QualityFactory> list = taoKeGoodsService.queryByQuality((totalPage - 1) * pageSize, pageSize,
+ searchKey, systemCid, listLabId);
+
if (list != null && list.size() != 0 && list.size() < 10) {
// 椤电爜+ 1 宸茶姹備竴娆℃窐瀹濇帴鍙�
- pageNo += 1 ;
+ pageNo += 1;
}
}
}
-
-
- /* 缃戠粶璇锋眰 */
+
+ /* 缃戠粶璇锋眰 */
SearchFilter searchfilter = null;
String searchParam = goodsSubClass.getSearchJson();
-
- if (!StringUtil.isNullOrEmpty(searchParam) && !StringUtil.isNullOrEmpty(order)
+
+ if (!StringUtil.isNullOrEmpty(searchParam) && !StringUtil.isNullOrEmpty(order)
&& Integer.parseInt(order) == 0) {
// 鎺ㄨ崘 浣跨敤瀛愬垎绫婚粯璁ゆ煡璇㈡潯浠�
Gson gs = new Gson();
searchfilter = gs.fromJson(searchParam, SearchFilter.class);
-
+
int quanfilter = searchfilter.getQuan();
if (quanfilter != 1) {
searchfilter.setQuan(1);
@@ -501,26 +534,32 @@
if (endPricefilter == null) {
searchfilter.setEndPrice(new BigDecimal(220));
}
-
+
boolean includeGoodRate = searchfilter.isIncludeGoodRate();
if (!includeGoodRate) {
searchfilter.setIncludeGoodRate(true);
}
-
+
} else {
searchfilter = new SearchFilter();
// 璁剧疆SearchFilter
- taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter, totalSales);
+ taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
+ totalSales);
+
+ // 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
+ if (searchfilter.getEndPrice() == null) {
+ searchfilter.setEndPrice(new BigDecimal(99999));
+ }
}
searchfilter.setPage(pageNo);
searchfilter.setPageSize(pageSize);
searchfilter.setKey(searchKey);
-
- if (!StringUtil.isNullOrEmpty(order) && Integer.parseInt(order) != 4 ) {
+
+ if (!StringUtil.isNullOrEmpty(order) && Integer.parseInt(order) != 4) {
searchfilter.setMaterialId("6707");
}
-
+
// 鏌ヨ鐗╂枡鎺ュ彛
JSONObject result = taoKeGoodsService.searchWuLiao(searchfilter);
out.print(JsonUtil.loadTrueResult(result));
@@ -536,7 +575,7 @@
@RequestMapping("choiceGoods")
public void choiceGoods(AcceptData acceptData, long gcid, int page, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -577,13 +616,6 @@
filter = new SearchFilter();
}
- // String searchKey = goodsClass.getName();
- // String key = goodsClass.getKey();
- // if (key != null && !"".equals(key.trim())) {
- // searchKey = key;
- // }
- // filter.setKey(searchKey);
-
filter.setMaterialId("6707");
filter.setPage(page);
filter.setPageSize(pageSize);
@@ -600,9 +632,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
// 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory selectionGoods : listQuery) {
@@ -622,7 +652,12 @@
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null)));
+ // 鐧藉簳鍥炬祴璇�
+ // if
+ // (!StringUtil.isNullOrEmpty(taoBaoGoodsBrief.getPictUrlWhite()))
+ // taoBaoGoodsBrief.setPictUrl(taoBaoGoodsBrief.getPictUrlWhite());
+
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
JSONObject data = new JSONObject();
@@ -631,60 +666,20 @@
data.put("result", array);
out.print(JsonUtil.loadTrueResult(data));
- /*
- * // 娴嬭瘯鍙栨秷缂撳瓨 GoodsClass goodsClass =
- * goodsClassService.getGoodsClassCache(gcid); if (goodsClass == null) {
- * out.append(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鍒嗙被")); return; }
- *
- * SearchFilter sf = new SearchFilter(); sf.setKey(goodsClass.getKey());
- * sf.setPage(page); sf.setPageSize(Constant.PAGE_SIZE); sf.setQuan(1);
- *
- * TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
- *
- * List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav(); if
- * (result.getNavList() != null) navList.addAll(result.getNavList());
- * Gson gson = new GsonBuilder().create(); JSONObject data = new
- * JSONObject(); data.put("nav", gson.toJson(navList));
- * List<TaoBaoGoodsBriefExtra> re = new
- * ArrayList<TaoBaoGoodsBriefExtra>(); List<TaoBaoGoodsBrief>
- * taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs(); Map<String,
- * String> map = manageService.convertMap(); String proportion =
- * map.get("hongbao_goods_proportion"); String fcRate =
- * map.get("hongbao_fc_ratio");
- *
- * TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra; if (taoBaoGoodsBriefs !=
- * null) for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- * int count = taoBaoGoodsBrief.getBiz30day(); if (count >= 10000) {
- * double sales = count; String salesCountMidea = String.format("%.1f",
- * sales / 10000); taoBaoGoodsBrief.setSalesCount(salesCountMidea +
- * "涓�"); taoBaoGoodsBriefExtra =
- * TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- * fcRate, ""); re.add(taoBaoGoodsBriefExtra); } else {
- * taoBaoGoodsBrief.setSalesCount(count + ""); taoBaoGoodsBriefExtra =
- * TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion,
- * fcRate, ""); re.add(taoBaoGoodsBriefExtra); } }
- *
- * Gson gson2 = JsonUtil.getApiCommonGson(); data.put("result",
- * gson2.toJson(re)); data.put("count",
- * result.getTaoBaoHead().getDocsfound());
- * out.print(JsonUtil.loadTrueResult(data));
- */
}
@RequestMapping("getCouponList")
- public void getCouponList(AcceptData acceptData, int page, PrintWriter out) {
+ public void getCouponList(AcceptData acceptData, int page, HttpServletRequest request, PrintWriter out) {
page = page > 0 ? page : 1;
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = taoBaoCouponService.getTaoBaoCouponList(page);
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
JSONArray array = new JSONArray();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");
array.add(gson.toJson(taoBaoGoodsBriefExtra));
}
int count = 10000;
@@ -692,6 +687,12 @@
data.put("taoBaoCoupons", array);
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
+
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, null));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -745,7 +746,7 @@
if (meterialId > 0)
result = TaoKeApiUtil.getMaterialByMaterialId(meterialId, page, 20);
else
- result = TaoKeApiUtil.searchCouple(goodsClassService.getKwById(id), null, page, 20);
+ result = TaoKeApiUtil.searchCouple(goodsClassService.getKeysById(id), null, page, 20);
List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();
if (result.getNavList() != null)
@@ -759,12 +760,10 @@
data.put("nav", gson.toJson(navList));
List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");
re.add(taoBaoGoodsBriefExtra);
}
@@ -789,12 +788,47 @@
*/
private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {
if (taoBaoCoupons.size() > 0) {
- String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+
for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {
- BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));
+ BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, proportion);
taoBaoCoupon.setHongbao(hb);
}
}
}
-
+
+ @RequestMapping(value = { "getcategory" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })
+ public void getcategory(AcceptData acceptData, PrintWriter out) {
+ try {
+
+ boolean changePicture = false;
+ String version = acceptData.getVersion();
+ int tversion = Integer.parseInt(version);
+ String platform = acceptData.getPlatform();
+ if ("android".equalsIgnoreCase(platform) && tversion > 38) {
+ changePicture = true;
+ } else if (tversion > 47){
+ changePicture = true;
+ }
+
+
+ List<Map<String, Object>> listCache = goodsClassService.getClassListAllCache(changePicture);
+ if (listCache == null) {
+ listCache = new ArrayList<Map<String, Object>>();
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("categoryList", listCache);
+
+ out.print(JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
}
--
Gitblit v1.8.0