提货订单物流信息增加发货时间

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

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
@@ -116,7 +117,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		return AjaxResult.success(userDeliverOrderVO);
 	}
 	
-	// 获取物流详情
+	// 获取用户提货订单物流封装列表
 	private List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItem> orderItems){
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
 		// 1.查询物流公司信息
@@ -150,12 +151,14 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		List<UserDeliverOrderItem> itemList = new ArrayList<UserDeliverOrderItem>();
 		if(null != shipParam && null != shipParam.getItemIds()
 				&& shipParam.getItemIds().size() > 0) {
+			Date deliveryTime = new Date();
 			for(String itemId : shipParam.getItemIds() ) {
 				if(StringUtils.isNotBlank(itemId)) {
 					UserDeliverOrderItem item = new UserDeliverOrderItem();
 		        	item.setItemId(itemId);
 		        	item.setDeliveryId(shipParam.getDeliveryId());
 		        	item.setDeliveryFlowId(shipParam.getDeliveryFlowId());
+		        	item.setDeliveryTime(deliveryTime);
 		        	itemList.add(item);
 				}
 			}

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrderItem.java

@@ -85,6 +85,13 @@ public class UserDeliverOrderItem implements Serializable {
   @TableField("delivery_flow_id")
   private String deliveryFlowId;
 
+  
+  /**
+   * 发货时间
+   */
+  @TableField("delivery_time")
+  private Date deliveryTime;
+  
   /**
    * 创建时间
    */

mp-service/src/main/java/com/qs/mp/user/domain/vo/OrderDeliverItemVO.java

@@ -1,6 +1,8 @@
 package com.qs.mp.user.domain.vo;
 
 import com.qs.mp.user.domain.UserDeliverOrderItem;
+
+import java.util.Date;
 import java.util.List;
 import lombok.Data;
 
@@ -33,6 +35,11 @@ public class OrderDeliverItemVO {
 	   * 物流单号ID
 	   */
 	  private String deliveryFlowId;
+	  
+	  /**
+	   * 发货时间
+	   */
+	  private Date deliveryTime;
 
 	  // 物流商品清单
 	  List<UserDeliverOrderItem> items;

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -15,19 +15,20 @@
         <result column="goods_num" property="goodsNum" />
         <result column="delivery_id" property="deliveryId" />
         <result column="delivery_flow_id" property="deliveryFlowId" />
+        <result column="delivery_time" property="deliveryTime" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        item_id, order_id, storage_id, goods_id, sku_id, properties, title, pic_url, goods_num, delivery_id, delivery_flow_id, created_time, updated_time
+        item_id, order_id, storage_id, goods_id, sku_id, properties, title, pic_url, goods_num, delivery_id, delivery_flow_id, delivery_time, created_time, updated_time
     </sql>
     
     
     <!-- 查询用户提货物流清单列表 -->
     <select id="selectOrderDeliverItemVOList" resultType="com.qs.mp.user.domain.vo.OrderDeliverItemVO">
-		select DISTINCT t1.delivery_id , t1.delivery_flow_id, t2.company_name ,t2.company_home_url ,t2.query_url
+		select DISTINCT t1.delivery_id , t1.delivery_flow_id, t1.delivery_time, t2.company_name ,t2.company_home_url ,t2.query_url
 		from mp_user_deliver_order_item t1
 		left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
 		where t1.order_id = #{orderId} and t1.delivery_flow_id is not null