Merge branch 'dev' into 'mp-server-test'

提货订单发货

See merge request quanshu/mp-server!169

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

@@ -95,18 +95,6 @@ public class UserDeliverOrder implements Serializable {
   @TableField("memo")
   private String memo;
 
-  /**
-   * 物流ID
-   */
-  @TableField("delivery_id")
-  private String deliveryId;
-
-  /**
-   * 物流单号
-   */
-  @TableField("delivery_flow_id")
-  private String deliveryFlowId;
-
   /**
    * 订单状态;-1 已取消 0:待付款 1:待发货 2:待收货 3:已完成
    */

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

@@ -0,0 +1,65 @@
+package com.qs.mp.user.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @describe 提货订单发货详情实体类
+ * @auther quanshu
+ * @create 2022-03-17 21:45:51
+ */
+@TableName("mp_user_deliver_order_detail")
+@Data
+public class UserDeliverOrderDetail implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId(value = "detail_id", type = IdType.INPUT)
+  private String detailId;
+
+  /**
+   * 订单ID
+   */
+  @TableField("order_id")
+  private String orderId;
+
+  /**
+   * 用户ID
+   */
+  @TableField("user_id")
+  private Long userId;
+
+  /**
+   * 物流ID
+   */
+  @TableField("delivery_id")
+  private String deliveryId;
+
+  /**
+   * 物流单号
+   */
+  @TableField("delivery_flow_id")
+  private String deliveryFlowId;
+
+  /**
+   * 创建时间
+   */
+  @TableField("created_time")
+  private Date createdTime;
+
+  /**
+   * 更新时间
+   */
+  @TableField("updated_time")
+  private Date updatedTime;
+
+
+}

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

@@ -73,6 +73,12 @@ public class UserDeliverOrderItem implements Serializable {
   @TableField("goods_num")
   private Integer goodsNum;
 
+  /**
+   * 发货详情ID
+   */
+  @TableField("detail_id")
+  private String detailId;
+
   /**
    * 创建时间
    */

mp-service/src/main/java/com/qs/mp/user/mapper/UserDeliverOrderDetailMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.user.mapper;
+
+import com.qs.mp.user.domain.UserDeliverOrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-03-17 21:45:51
+ * @describe 提货订单发货详情mapper类
+ */
+public interface UserDeliverOrderDetailMapper extends BaseMapper<UserDeliverOrderDetail> {
+
+}

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderDetailService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.user.service;
+
+import com.qs.mp.user.domain.UserDeliverOrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提货订单发货详情 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-17
+ */
+public interface IUserDeliverOrderDetailService extends IService<UserDeliverOrderDetail> {
+
+}

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.user.service.impl;
+
+import com.qs.mp.user.domain.UserDeliverOrderDetail;
+import com.qs.mp.user.mapper.UserDeliverOrderDetailMapper;
+import com.qs.mp.user.service.IUserDeliverOrderDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提货订单发货详情 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-17
+ */
+@Service
+public class UserDeliverOrderDetailServiceImpl extends ServiceImpl<UserDeliverOrderDetailMapper, UserDeliverOrderDetail> implements IUserDeliverOrderDetailService {
+
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.mp.user.mapper.UserDeliverOrderDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.user.domain.UserDeliverOrderDetail">
+        <id column="detail_id" property="detailId" />
+        <result column="order_id" property="orderId" />
+        <result column="user_id" property="userId" />
+        <result column="delivery_id" property="deliveryId" />
+        <result column="delivery_flow_id" property="deliveryFlowId" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        detail_id, order_id, user_id, delivery_id, delivery_flow_id, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -13,13 +13,14 @@
         <result column="title" property="title" />
         <result column="pic_url" property="picUrl" />
         <result column="goods_num" property="goodsNum" />
+        <result column="detail_id" property="detailId" />
         <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, created_time, updated_time
+        item_id, order_id, storage_id, goods_id, sku_id, properties, title, pic_url, goods_num, detail_id, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

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

@@ -16,8 +16,6 @@
         <result column="pay_amt" property="payAmt" />
         <result column="freight_amt" property="freightAmt" />
         <result column="memo" property="memo" />
-        <result column="delivery_id" property="deliveryId" />
-        <result column="delivery_flow_id" property="deliveryFlowId" />
         <result column="status" property="status" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -25,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        order_id, user_id, receiver, tel, province, city, area, address, order_num, pay_amt, freight_amt, memo, delivery_id, delivery_flow_id, status, created_time, updated_time
+        order_id, user_id, receiver, tel, province, city, area, address, order_num, pay_amt, freight_amt, memo, status, created_time, updated_time
     </sql>
 
 </mapper>