From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 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 b62e3c8..5eca7dc 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,36 +19,34 @@
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;
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;
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.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -73,9 +70,6 @@
private GoodsSecondClassService goodsSecondClassService;
@Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
-
- @Resource
private GoodsClassService goodsClassService;
@Resource
@@ -91,7 +85,7 @@
private HongBaoManageService manageService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private RedisManager redisManager;
@@ -112,6 +106,12 @@
@Resource
private MonitorService monitorService;
+
+ @Resource
+ private HomeNavbarService homeNavbarService;
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -126,7 +126,7 @@
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;
@@ -162,22 +162,30 @@
* @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;
}
+ // 杞挱鍥�
+ List<SwiperPicture> picList = null;
+ if (swpid != null) {
+ picList = swiperPictureService.getByBannerId(swpid);
+ }
+ if (picList == null) {
+ picList = new ArrayList<SwiperPicture>();
+ }
+
List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1);
if (goodsSubClassList == null) {
goodsSubClassList = new ArrayList<GoodsSubClass>();
}
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));
@@ -201,7 +209,12 @@
goodsClass.setIosClick(1L);
}
}
- goodsClassService.updateByPrimaryKeySelective(goodsClass);
+
+ GoodsClass gc = new GoodsClass();
+ gc.setId(goodsClass.getId());
+ gc.setIosClick(goodsClass.getIosClick());
+ gc.setAndroidClick(goodsClass.getAndroidClick());
+ goodsClassService.updateByPrimaryKeySelective(gc);
}
});
@@ -216,20 +229,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) {
@@ -280,7 +279,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;
@@ -388,7 +387,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;
@@ -562,7 +561,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;
@@ -778,7 +777,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)
@@ -832,7 +831,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("绯荤粺涓嶅瓨鍦�"));
--
Gitblit v1.8.0