From f4fa74c0347e2e82a4df10d0a4a41fa6b45c9325 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 09:34:52 +0800
Subject: [PATCH] 专题对象 清理 hibernate引入
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java | 79 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 49 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..8787cb4 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
@@ -4,7 +4,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -20,23 +19,19 @@
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.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;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
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;
@@ -49,7 +44,6 @@
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.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -73,9 +67,6 @@
private GoodsSecondClassService goodsSecondClassService;
@Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
-
- @Resource
private GoodsClassService goodsClassService;
@Resource
@@ -91,7 +82,7 @@
private HongBaoManageService manageService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private RedisManager redisManager;
@@ -112,11 +103,10 @@
@Resource
private MonitorService monitorService;
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
-
+
/**
* 鑾峰彇涓荤被鐩�
*
@@ -125,24 +115,24 @@
*/
@RequestMapping(value = "getgoodsclass", method = RequestMethod.POST)
public void getGoodsClass(AcceptData acceptData, PrintWriter out) {
-
+
try {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(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 +142,7 @@
e1.printStackTrace();
}
}
-
+
}
/**
@@ -182,7 +172,7 @@
data.put("count", goodsSubClassList.size());
data.put("goodsSecondClassList", JsonUtil.getApiCommonGson().toJson(goodsSubClassList));
out.print(JsonUtil.loadTrueResult(data));
-
+
// 鏇存柊鍒嗙被鐐瑰嚮娆℃暟
executor.execute(new Runnable() {
@Override
@@ -217,20 +207,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) {
@@ -281,7 +257,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;
@@ -389,7 +365,7 @@
@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;
@@ -533,8 +509,8 @@
// 璁剧疆SearchFilter
taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
totalSales);
-
- // 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
+
+ // 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
if (searchfilter.getEndPrice() == null) {
searchfilter.setEndPrice(new BigDecimal(99999));
}
@@ -563,7 +539,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;
@@ -646,6 +622,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 +797,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);
}
}
@@ -828,7 +809,7 @@
@RequestMapping(value = { "getcategory" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })
public void getcategory(AcceptData acceptData, PrintWriter out) {
try {
- com.yeshi.fanli.entity.system.System system = this.systemService.getSystemCache(acceptData.getPlatform(),
+ com.yeshi.fanli.entity.system.BusinessSystem system = this.businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -837,14 +818,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