From f542d5b888cf1f223cc143592b814bce2b899754 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 30 八月 2019 14:51:04 +0800
Subject: [PATCH] 订单bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index 3bb2a63..7cad6e3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
@@ -108,14 +109,25 @@
* @param out
*/
@RequestMapping(value = "getorder", method = RequestMethod.POST)
- public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState,
- String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,
- Integer goodsType, PrintWriter out) {
+ public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state,
+ @RequestParam("type") String type1, Integer orderState, String orderNo, String startTime, String endTime,
+ Integer slotTime, Boolean needCount, Integer dateType, Integer goodsType, PrintWriter out) {
+ Integer type = null;
+
+ if (StringUtil.isNullOrEmpty(type1)) {
+ type = null;
+ } else {
+ type = Integer.parseInt(type1);
+ }
+
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ if (needCount == null)
+ needCount = false;
if (page == null || page < 1) {
page = 1;
--
Gitblit v1.8.0