Merge remote-tracking branch 'origin/master'

2019-03-31 18:43:49 +08:00
parent 6699bd34a8 5b51d529de
commit 7fe2541e2e
28 changed files with 1946 additions and 83 deletions
--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java
@@ -0,0 +1,28 @@
+package cn.iocoder.mall.order.biz.convert;
+
+import cn.iocoder.mall.order.api.bo.OrderRecipientBO;
+import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
+import cn.iocoder.mall.order.biz.dataobject.OrderRecipientDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 订单收件人信息
+ *
+ * @author Sin
+ * @time 2019-03-31 12:50
+ */
+@Mapper
+public interface OrderRecipientConvert {
+
+    OrderRecipientConvert INSTANCE = Mappers.getMapper(OrderRecipientConvert.class);
+
+    @Mappings({})
+    OrderRecipientDO convert(OrderCreateDTO orderCreateDTO);
+
+    @Mappings({})
+    List<OrderRecipientBO> convert(List<OrderRecipientDO> orderRecipientDOList);
+}
--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java
@@ -0,0 +1,36 @@
+package cn.iocoder.mall.order.biz.dao;
+
+import cn.iocoder.mall.order.biz.dataobject.OrderRecipientDO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单收件人 信息
+ *
+ * @author Sin
+ * @time 2019-03-31 12:16
+ */
+@Repository
+public interface OrderRecipientMapper {
+
+    /**
+     * 插入 - 订单收件人
+     *
+     * @param orderRecipient
+     * @return
+     */
+    int insert(OrderRecipientDO orderRecipient);
+
+    /**
+     * 查询 - 根据 orderIds
+     *
+     * @param orderIds
+     * @return
+     */
+    List<OrderRecipientDO> selectByOrderIds(
+            @Param("orderIds")Collection<Integer> orderIds
+    );
+}
--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java
@@ -0,0 +1,103 @@
+package cn.iocoder.mall.order.biz.dataobject;
+
+import cn.iocoder.common.framework.dataobject.BaseDO;
+
+/**
+ * 订单收件人信息 order_recipient
+ *
+ * @author Sin
+ * @time 2019-03-31 11:37
+ */
+public class OrderRecipientDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 订单id
+     */
+    private Integer orderId;
+    /**
+     * 收件区域编号
+     */
+    private String areaNo;
+    /**
+     * 收件人名称
+     */
+    private String name;
+    /**
+     * 收件手机号
+     */
+    private String mobile;
+    /**
+     * 收件详细地址
+     */
+    private String address;
+
+    @Override
+    public String toString() {
+        return "OrderRecipientDO{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", areaNo='" + areaNo + '\'' +
+                ", name='" + name + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", address='" + address + '\'' +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public OrderRecipientDO setId(Integer id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public OrderRecipientDO setOrderId(Integer orderId) {
+        this.orderId = orderId;
+        return this;
+    }
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
+    public OrderRecipientDO setAreaNo(String areaNo) {
+        this.areaNo = areaNo;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public OrderRecipientDO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public OrderRecipientDO setMobile(String mobile) {
+        this.mobile = mobile;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public OrderRecipientDO setAddress(String address) {
+        this.address = address;
+        return this;
+    }
+}
--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java
@@ -13,14 +13,9 @@ import cn.iocoder.mall.order.biz.OrderCommon;
 import cn.iocoder.mall.order.biz.convert.OrderConvert;
 import cn.iocoder.mall.order.biz.convert.OrderItemConvert;
 import cn.iocoder.mall.order.biz.convert.OrderLogisticsConvert;
-import cn.iocoder.mall.order.biz.dao.OrderCancelMapper;
-import cn.iocoder.mall.order.biz.dao.OrderItemMapper;
-import cn.iocoder.mall.order.biz.dao.OrderLogisticsMapper;
-import cn.iocoder.mall.order.biz.dao.OrderMapper;
-import cn.iocoder.mall.order.biz.dataobject.OrderCancelDO;
-import cn.iocoder.mall.order.biz.dataobject.OrderDO;
-import cn.iocoder.mall.order.biz.dataobject.OrderItemDO;
-import cn.iocoder.mall.order.biz.dataobject.OrderLogisticsDO;
+import cn.iocoder.mall.order.biz.convert.OrderRecipientConvert;
+import cn.iocoder.mall.order.biz.dao.*;
+import cn.iocoder.mall.order.biz.dataobject.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +42,8 @@ public class OrderServiceImpl implements OrderService {
    @Autowired
    private OrderLogisticsMapper orderLogisticsMapper;
    @Autowired
+    private OrderRecipientMapper orderRecipientMapper;
+    @Autowired
    private OrderCancelMapper orderCancelMapper;
    @Autowired
    private OrderCommon orderCommon;
@@ -67,16 +64,11 @@ public class OrderServiceImpl implements OrderService {
                .map(orderDO -> orderDO.getId())
                .collect(Collectors.toSet());

-        Set<Integer> orderLogisticsIds = orderDOList.stream()
-                .map(orderDO -> orderDO.getOrderLogisticsId())
-                .collect(Collectors.toSet());
-
        // 获取物流信息
-        List<OrderLogisticsDO> orderLogisticsDOList = orderLogisticsMapper.selectByIds(orderLogisticsIds);
-        List<OrderLogisticsBO> orderLogisticsBOList
-                = OrderLogisticsConvert.INSTANCE.convertOrderLogisticsBO(orderLogisticsDOList);
-        Map<Integer, OrderLogisticsBO> orderLogisticsDOMap
-                = orderLogisticsBOList.stream().collect(Collectors.toMap(OrderLogisticsBO::getId, obj -> obj));
+        List<OrderRecipientDO> orderRecipientDOList = orderRecipientMapper.selectByOrderIds(orderIds);
+        List<OrderRecipientBO> orderRecipientBOList = OrderRecipientConvert.INSTANCE.convert(orderRecipientDOList);
+        Map<Integer, OrderRecipientBO> orderRecipientBOMap
+                = orderRecipientBOList.stream().collect(Collectors.toMap(OrderRecipientBO::getOrderId, obj -> obj));

        // 获取 订单的 items
        List<OrderItemDO> orderItemDOList = orderItemMapper
@@ -100,8 +92,8 @@ public class OrderServiceImpl implements OrderService {
            if (orderItemBOMultimap.containsKey(orderBO.getId())) {
                orderBO.setOrderItems(orderItemBOMultimap.get(orderBO.getId()));
            }
-            if (orderLogisticsDOMap.containsKey(orderBO.getOrderLogisticsId())) {
-                orderBO.setOrderLogistics(orderLogisticsDOMap.get(orderBO.getOrderLogisticsId()));
+            if (orderRecipientBOMap.containsKey(orderBO.getId())) {
+                orderBO.setOrderRecipient(orderRecipientBOMap.get(orderBO.getId()));
            }
            return orderBO;
        }).collect(Collectors.toList());
@@ -117,7 +109,7 @@ public class OrderServiceImpl implements OrderService {
    @Transactional
    public CommonResult<OrderCreateBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO) {
        List<OrderCreateItemDTO> orderItemDTOList = orderCreateDTO.getOrderItems();
-        OrderLogisticsDO orderLogisticsDO = OrderLogisticsConvert.INSTANCE.convert(orderCreateDTO);
+        OrderRecipientDO orderRecipientDO = OrderRecipientConvert.INSTANCE.convert(orderCreateDTO);
        List<OrderItemDO> orderItemDOList = OrderItemConvert.INSTANCE.convert(orderItemDTOList);

        // TODO: 2019-03-24 sin 校验商品是否存在
@@ -137,17 +129,10 @@ public class OrderServiceImpl implements OrderService {
 //            orderItemDO.setPrice(1000);
 //        }

-        // 物流信息
-        orderLogisticsDO
-                .setLogisticsNo("")
-                .setCreateTime(new Date())
-                .setUpdateTime(null);
-        orderLogisticsMapper.insert(orderLogisticsDO);
-
        // order
        OrderDO orderDO = new OrderDO()
                .setUserId(userId)
-                .setOrderLogisticsId(orderLogisticsDO.getId())
+                .setOrderLogisticsId(null)
                .setOrderNo(UUID.randomUUID().toString().replace("-", ""))
                .setPayAmount(-1) // 先设置一个默认值，金额在下面计算
                .setClosingTime(null)
@@ -162,6 +147,14 @@ public class OrderServiceImpl implements OrderService {
        orderDO.setUpdateTime(null);
        orderMapper.insert(orderDO);

+        // 收件人信息
+        orderRecipientDO
+                .setOrderId(orderDO.getId())
+                .setCreateTime(new Date())
+                .setUpdateTime(null);
+
+        orderRecipientMapper.insert(orderRecipientDO);
+
        // order item
        orderItemDOList.forEach(orderItemDO -> {
            int goodsPrice = 1000; // 商品单价
@@ -271,6 +264,11 @@ public class OrderServiceImpl implements OrderService {
        return CommonResult.success(null);
    }

+    @Override
+    public CommonResult orderDelivery(OrderDeliveryDTO orderDelivery) {
+        return null;
+    }
+
    @Override
    public CommonResult updateOrderRemake(Integer orderId, String remake) {
        // 此处不做订单校验，直接设置备注即可
--- a/order/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml
+++ b/order/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml
@@ -0,0 +1,35 @@
+<?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="cn.iocoder.mall.order.biz.dao.OrderRecipientMapper">
+
+    <sql id="FIELDS">
+        id, order_id, `area_no`, `name`, mobile, address,
+        create_time, update_time
+    </sql>
+
+    <!--
+        插入数据
+    -->
+    <insert id="insert" parameterType="OrderRecipientDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        INSERT INTO `order_recipient` (
+            order_id, `area_no`, `name`, mobile, address,
+            create_time, update_time
+        ) VALUES (
+            #{orderId}, #{areaNo}, #{name}, #{mobile}, #{address},
+            #{createTime}, #{updateTime}
+        )
+    </insert>
+
+    <!--
+        查询 - 根据 orderIds
+    -->
+    <select id="selectByOrderIds" resultType="cn.iocoder.mall.order.biz.dataobject.OrderRecipientDO">
+        SELECT
+        <include refid="FIELDS" />
+        FROM `order_recipient`
+        WHERE order_id IN
+        <foreach collection="orderIds" item="orderId" separator="," open="(" close=")">
+            #{orderId}
+        </foreach>
+    </select>
+</mapper>