From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
index 220dc30..ebd7507 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
@@ -7,12 +7,10 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
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;
@@ -22,9 +20,8 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
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.TaoBaoCoupon;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
@@ -32,14 +29,15 @@
import com.yeshi.fanli.service.inter.goods.SuperGoodsClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/xcx/v1/XcxClass")
@@ -114,7 +112,7 @@
*/
@RequestMapping(value = "getgoodsclass", method = RequestMethod.POST)
public void getGoodsClass(AcceptData acceptData, PrintWriter out) {
- System system = xcxMiniControllerUtil.getSystem(acceptData);
+ BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);
if (system == null) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
return;
@@ -226,7 +224,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 = xcxMiniControllerUtil.getSystem(acceptData);
+ BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);
if (system == null) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
return;
--
Gitblit v1.8.0