From 7e3d4837b8464c32c4c25f40eb01222a8759eeb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 10:57:56 +0800
Subject: [PATCH] 删除PidOrder相关代码
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 5570bcc..b62e3c8 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
@@ -112,11 +112,10 @@
@Resource
private MonitorService monitorService;
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
-
+
/**
* 鑾峰彇涓荤被鐩�
*
@@ -125,24 +124,24 @@
*/
@RequestMapping(value = "getgoodsclass", method = RequestMethod.POST)
public void getGoodsClass(AcceptData acceptData, PrintWriter out) {
-
+
try {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
}
-
+
List<GoodsClass> goodsClassList = goodsClassService.getListClassCache(system.getId());
if (goodsClassList == null || goodsClassList.size() == 0) {
out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
JSONObject data = new JSONObject();
data.put("count", goodsClassList.size());
data.put("goodsClassList", goodsClassList);
-
+
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
@@ -152,7 +151,7 @@
e1.printStackTrace();
}
}
-
+
}
/**
@@ -182,7 +181,7 @@
data.put("count", goodsSubClassList.size());
data.put("goodsSecondClassList", JsonUtil.getApiCommonGson().toJson(goodsSubClassList));
out.print(JsonUtil.loadTrueResult(data));
-
+
// 鏇存柊鍒嗙被鐐瑰嚮娆℃暟
executor.execute(new Runnable() {
@Override
@@ -533,8 +532,8 @@
// 璁剧疆SearchFilter
taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
totalSales);
-
- // 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
+
+ // 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
if (searchfilter.getEndPrice() == null) {
searchfilter.setEndPrice(new BigDecimal(99999));
}
@@ -646,6 +645,11 @@
} else {
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
+
+ // 鐧藉簳鍥炬祴璇�
+ // if
+ // (!StringUtil.isNullOrEmpty(taoBaoGoodsBrief.getPictUrlWhite()))
+ // taoBaoGoodsBrief.setPictUrl(taoBaoGoodsBrief.getPictUrlWhite());
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
@@ -816,10 +820,10 @@
*/
private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {
if (taoBaoCoupons.size() > 0) {
- BigDecimal proportion= hongBaoManageService.getFanLiRate();
-
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+
for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {
- BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon,proportion);
+ BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, proportion);
taoBaoCoupon.setHongbao(hb);
}
}
@@ -837,14 +841,14 @@
List<Map<String, Object>> listCache = goodsClassService.getClassListAllCache(system.getId());
if (listCache == null) {
- listCache = new ArrayList<Map<String,Object>>();
+ 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 {
--
Gitblit v1.8.0