修改用户订单提货详情查询接口

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -113,22 +113,21 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		
 		userDeliverOrderVO.setItems(orderItems);
 		// 获取物流详情
-		userDeliverOrderVO.setDeliverList(getDeliverItemList(order.getOrderId(), orderItems));
+		userDeliverOrderVO.setDeliverList(getDeliverItemList(order.getOrderId()));
 		return AjaxResult.success(userDeliverOrderVO);
 	}
 	
 	// 获取用户提货订单物流封装列表
-	private List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItem> orderItems){
+	private List<OrderDeliverItemVO> getDeliverItemList(String orderId){
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
 		// 1.查询物流公司信息
 		itemList = userDeliverOrderItemService.selectOrderDeliverItemVOList(orderId);
 		// 2.查询物流包裹内的商品信息
-		if(null != itemList && itemList.size() >0 
-				&& null != orderItems && orderItems.size() >0) {
+		if(null != itemList && itemList.size() >0 ) {
 			for(OrderDeliverItemVO itemVO : itemList) {
 				if(null != itemVO && StringUtils.isNotBlank(itemVO.getDeliveryFlowId())) {
-					List<UserDeliverOrderItem> items = orderItems.stream()
-							.filter(obj -> StringUtils.isNotBlank(obj.getDeliveryFlowId()) && obj.getDeliveryFlowId().equals(itemVO.getDeliveryFlowId())).collect(Collectors.toList());
+					List<UserDeliverOrderItem> items = userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
+							.eq(UserDeliverOrderItem::getOrderId, orderId).eq(UserDeliverOrderItem::getDeliveryFlowId, itemVO.getDeliveryFlowId()));
 					itemVO.setItems(items);
 				}
 			}

mp-admin/src/test/java/com/qs/mp/api/UserDeliverOrderMgrControllerTest.java

@@ -0,0 +1,42 @@
+package com.qs.mp.api;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import com.alibaba.fastjson.JSON;
+import com.qs.mp.common.BaseControllerTest;
+
+/**
+ * @auther duota
+ * @create 2021 2021/9/7 6:36 下午
+ * @describe
+ */
+public class UserDeliverOrderMgrControllerTest extends BaseControllerTest {
+
+  /**
+   * 发送短信验证码接口
+   */
+  @Test
+  public void testList(){
+    Map<String, Object> map = new HashMap<String, Object>();
+	int pageNum = 1;
+	int pageSize = 10;
+	map.put("pageNum", pageNum);
+	map.put("pageSize", pageSize);
+	String params = JSON.toJSONString(map);
+    String url = "http://localhost:8080/api/v1/mp/admin/deliver/order/list?";
+    System.out.println(request(url, params));
+  }
+  
+  
+  @Test
+  public void testQuery(){
+    Map<String, Object> map = new HashMap<String, Object>();
+	map.put("orderId", "95588124524032822218");
+	String params = JSON.toJSONString(map);
+    String url = "http://localhost:8080/api/v1/mp/admin/deliver/order/detail?";
+    System.out.println(request(url, params));
+  }
+}

mp-admin/src/test/java/com/qs/mp/common/BaseControllerTest.java

@@ -31,7 +31,7 @@ public class BaseControllerTest {
     headers.put("content-type", "application/json; charset=UTF-8");
     headers.put("x-zz-timestamp", timestamp);
     // 本地登录状态
-    String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjEyY2NjMzUyLTZmZWQtNDVlNC04NzIzLWJlNjliOWM0Zjg0NCJ9.GAYmA8UEM3Tt97rAGl6PHSAC1wMqrxIlsbmBIpDXdmOACyYcYBgatAxLArovIJlEs1kYDVw_Z64nkE46I6Im2g";
+    String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijg3ZWM0OGMwLWQ4ZWYtNDcwYS05ZTQ5LThhOWI0NWMzOWM3MSJ9.q3l1Q0xoWBvXY6eZKfEAKXHZclb2ssMdGO4xd5IjvSNnIRdOLT8kA9jsGo8iR2KZOXjaEfN_DBxPfD6vGZpemg";
 
     if (!StringUtils.isBlank(token)) {
       headers.put("Authorization", "Bearer "+token);

mp-service/src/main/java/com/qs/mp/admin/domain/Goods.java

@@ -179,7 +179,14 @@ public class Goods implements Serializable {
           
           Map<String,Object> mapObj = new HashMap<String,Object>();
           mapObj.put("name", key);
-          mapObj.put("value", value);
+          if(value instanceof List<?>) {
+        	  mapObj.put("value", value);
+          }else {
+        	  List<Object> list = new ArrayList<>();
+        	  list.add(value+"");
+        	  mapObj.put("value", list);
+          }
+         
           mapList.add(mapObj);
       }
 	  
@@ -196,12 +203,12 @@ public class Goods implements Serializable {
 		System.out.println("isb == " + isb);
 		List<Object> list = new ArrayList<>();
 		if (isa) {
-			list.addAll((List<Object>) a);
+			list.addAll((List<?>) a);
 		} else {
 			list.add(a+"");
 		}
 		if (isb) {
-			list.addAll((List<Object>) b);
+			list.addAll((List<?>) b);
 		} else {
 			list.add(b+"");
 		}