From 1890f867f737d08d57809ed8a8d32d1ba9a1c1f8 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sun, 26 Aug 2018 21:31:20 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-admin-api,=20litemall-admin]:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dspring=20boot=202.0=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=E5=B8=A6=E6=9D=A5=E7=9A=84get=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E6=94=AF=E6=8C=81'[]'=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=88=E8=BF=99=E4=B8=AA=E7=AC=A6=E5=8F=B7=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linlinjava/litemall/admin/web/AdminOrderController.java | 6 ++++--
 litemall-admin/package.json                                 | 1 +
 litemall-admin/src/api/order.js                             | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
index 52695e4d..9169a90c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
@@ -24,6 +24,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -53,7 +54,8 @@ public class AdminOrderController {
 
     @GetMapping("/list")
     public Object list(@LoginAdmin Integer adminId,
-                       Integer userId, String orderSn, @RequestParam(required = false, value = "orderStatusArray[]") List<Short> orderStatusArray,
+                       Integer userId, String orderSn,
+                       @RequestParam(required = false) List<Short> orderStatusArray,
                        @RequestParam(defaultValue = "1") Integer page,
                        @RequestParam(defaultValue = "10") Integer limit,
                        @Sort @RequestParam(defaultValue = "add_time") String sort,
@@ -72,7 +74,7 @@ public class AdminOrderController {
     }
 
     @GetMapping("/detail")
-    public Object detail(@LoginAdmin Integer adminId, Integer id) {
+    public Object detail(@LoginAdmin Integer adminId, @NotNull Integer id) {
         if (adminId == null) {
             return ResponseUtil.unlogin();
         }
diff --git a/litemall-admin/package.json b/litemall-admin/package.json
index 1ad6a5fb..0935ca5b 100644
--- a/litemall-admin/package.json
+++ b/litemall-admin/package.json
@@ -24,6 +24,7 @@
     "mockjs": "1.0.1-beta3",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
+    "qs": "^6.5.2",
     "screenfull": "3.3.2",
     "v-charts": "^1.16.19",
     "vue": "2.5.10",
diff --git a/litemall-admin/src/api/order.js b/litemall-admin/src/api/order.js
index 9c7dac9d..49388c9a 100644
--- a/litemall-admin/src/api/order.js
+++ b/litemall-admin/src/api/order.js
@@ -1,10 +1,14 @@
 import request from '@/utils/request'
+import Qs from 'qs'
 
 export function listOrder(query) {
   return request({
     url: '/order/list',
     method: 'get',
-    params: query
+    params: query,
+    paramsSerializer: function(params) {
+      return Qs.stringify(params, { arrayFormat: 'repeat' })
+    }
   })
 }