From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
index c8ef984..101ae5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
@@ -6,22 +6,20 @@
import javax.annotation.Resource;
-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.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
-import com.yeshi.fanli.exception.HongBaoManageException;
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.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/web/v1/class")
@@ -42,7 +40,7 @@
* @param page
* @param out
*/
- @RequestMapping(value = "getCouponList", method = RequestMethod.GET)
+ @RequestMapping(value = "getCouponList")
public void getCouponList(AcceptData acceptData, String callback, int page, PrintWriter out) {
List<TaoBaoCoupon> taoBaoCoupons = taoBaoCouponService.getTaoBaoCouponListBykeys(null, page);
int count = taoBaoCouponService.getCount("");
--
Gitblit v1.8.0