From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 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..12e35a7 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;
 
@@ -25,17 +24,15 @@
 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.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService;
 import com.yeshi.fanli.service.inter.goods.GoodsClassService;
 import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
@@ -49,7 +46,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;
@@ -91,7 +87,7 @@
 	private HongBaoManageService manageService;
 
 	@Resource
-	private SystemService systemService;
+	private BusinessSystemService businessSystemService;
 
 	@Resource
 	private RedisManager redisManager;
@@ -112,11 +108,10 @@
 
 	@Resource
 	private MonitorService monitorService;
-	
+
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
-	
-	
+
 	/**
 	 * 鑾峰彇涓荤被鐩�
 	 * 
@@ -125,24 +120,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 +147,7 @@
 				e1.printStackTrace();
 			}
 		}
-		
+
 	}
 
 	/**
@@ -182,7 +177,7 @@
 			data.put("count", goodsSubClassList.size());
 			data.put("goodsSecondClassList", JsonUtil.getApiCommonGson().toJson(goodsSubClassList));
 			out.print(JsonUtil.loadTrueResult(data));
-			
+
 			// 鏇存柊鍒嗙被鐐瑰嚮娆℃暟
 			executor.execute(new Runnable() {
 				@Override
@@ -281,7 +276,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 +384,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 +528,8 @@
 				// 璁剧疆SearchFilter
 				taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,
 						totalSales);
-				
-				// 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂    鏈�楂樹环鏍奸檺鍒�99999
+
+				// 鐢ㄦ埛鏈緭鍏ユ渶楂樹环鏍兼椂 鏈�楂樹环鏍奸檺鍒�99999
 				if (searchfilter.getEndPrice() == null) {
 					searchfilter.setEndPrice(new BigDecimal(99999));
 				}
@@ -563,7 +558,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 +641,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 +816,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 +828,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 +837,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