- 联调订单流程

2019-04-08 23:38:08 +08:00
parent 77c6edefb3
commit 07e9ef260f
38 changed files with 400 additions and 175 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
@@ -3,6 +3,7 @@ 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 cn.iocoder.mall.user.api.bo.UserAddressBO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
@@ -23,6 +24,9 @@ public interface OrderRecipientConvert {
    @Mappings({})
    OrderRecipientDO convert(OrderCreateDTO orderCreateDTO);

+    @Mappings({})
+    OrderRecipientDO convert(UserAddressBO userAddressBO);
+
    @Mappings({})
    OrderRecipientBO convert(OrderRecipientDO orderRecipientDO);

--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java
@@ -32,6 +32,10 @@ public class OrderItemDO extends DeletableDO {
     * 商品编号
     */
    private Integer skuId;
+    /**
+     * 物流id
+     */
+    private Integer orderLogisticsId;
    /**
     * 商品名称
     */
@@ -52,10 +56,6 @@ public class OrderItemDO extends DeletableDO {
     * 支付金额（实付金额）
     */
    private Integer payAmount;
-    /**
-     * 物流id
-     */
-    private Integer orderLogisticsId;

    ///
    /// 时间信息
--- 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
@@ -1,6 +1,7 @@
 package cn.iocoder.mall.order.biz.service;

 import cn.iocoder.common.framework.constant.DeletedStatusEnum;
+import cn.iocoder.common.framework.util.DateUtil;
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.order.api.OrderService;
@@ -8,6 +9,7 @@ import cn.iocoder.mall.order.api.bo.*;
 import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum;
 import cn.iocoder.mall.order.api.constant.OrderHasReturnExchangeEnum;
 import cn.iocoder.mall.order.api.constant.OrderStatusEnum;
+import cn.iocoder.mall.order.api.constant.PayAppId;
 import cn.iocoder.mall.order.api.dto.*;
 import cn.iocoder.mall.order.biz.OrderCommon;
 import cn.iocoder.mall.order.biz.constants.OrderDeliveryTypeEnum;
@@ -18,10 +20,18 @@ import cn.iocoder.mall.order.biz.convert.OrderLogisticsConvert;
 import cn.iocoder.mall.order.biz.convert.OrderRecipientConvert;
 import cn.iocoder.mall.order.biz.dao.*;
 import cn.iocoder.mall.order.biz.dataobject.*;
+import cn.iocoder.mall.pay.api.PayTransactionService;
+import cn.iocoder.mall.pay.api.dto.PayTransactionCreateDTO;
+import cn.iocoder.mall.product.api.ProductSpuService;
+import cn.iocoder.mall.product.api.bo.ProductSpuBO;
+import cn.iocoder.mall.user.api.UserAddressService;
+import cn.iocoder.mall.user.api.bo.UserAddressBO;
+import com.alibaba.dubbo.config.annotation.Reference;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;

 import java.util.*;
@@ -37,6 +47,11 @@ import java.util.stream.Collectors;
@com.alibaba.dubbo.config.annotation.Service(validation = "true")
 public class OrderServiceImpl implements OrderService {

+    /**
+     * 支付过期时间 15 分钟
+     */
+    public static final int PAY_EXPIRE_TIME = 15;
+
    @Autowired
    private OrderMapper orderMapper;
    @Autowired
@@ -50,6 +65,13 @@ public class OrderServiceImpl implements OrderService {
    @Autowired
    private OrderCommon orderCommon;

+    @Reference
+    private ProductSpuService productSpuService;
+    @Reference
+    private UserAddressService userAddressService;
+    @Reference
+    private PayTransactionService payTransactionService;
+
    @Override
    public CommonResult<OrderPageBO> getOrderPage(OrderQueryDTO orderQueryDTO) {

@@ -61,6 +83,10 @@ public class OrderServiceImpl implements OrderService {
        // 获取订单数据
        List<OrderDO> orderDOList = orderMapper.selectPage(orderQueryDTO);

+        if (CollectionUtils.isEmpty(orderDOList)) {
+            return CommonResult.success(new OrderPageBO().setOrders(Collections.EMPTY_LIST).setTotal(totalCount));
+        }
+
        // 获取订单 id
        Set<Integer> orderIds = orderDOList.stream()
                .map(orderDO -> orderDO.getId())
@@ -133,33 +159,59 @@ public class OrderServiceImpl implements OrderService {

    @Override
    @Transactional
-    public CommonResult<OrderCreateBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO) {
+    public CommonResult<OrderCreateBO> createOrder(OrderCreateDTO orderCreateDTO) {
+        Integer userId = orderCreateDTO.getUserId();
        List<OrderCreateItemDTO> orderItemDTOList = orderCreateDTO.getOrderItems();
-        OrderRecipientDO orderRecipientDO = OrderRecipientConvert.INSTANCE.convert(orderCreateDTO);
        List<OrderItemDO> orderItemDOList = OrderItemConvert.INSTANCE.convert(orderItemDTOList);

-        // TODO: 2019-03-24 sin 校验商品是否存在
-//        for (OrderItemDO orderItemDO : orderItemDOList) {
-//            CommonResult<ProductSpuDetailBO> result = productSpuService.getProductSpu(orderItemDO.getSkuId());
-//
-//            // 有任何商品获取失败，或者为 null，都直接返回失败。
-//            if (result.isError()) {
-//                return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_SKU_FAIL.getCode());
-//            }
-//
-//            if (result.getData() == null) {
-//                return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_SKU_NOT_EXISTENT.getCode());
-//            }
-//
-//            ProductSpuDetailBO spuDetailBO = result.getData();
-//            orderItemDO.setPrice(1000);
-//        }
+        // 获取商品信息
+        Set<Integer> skuIds = orderItemDOList.stream()
+                .map(orderItemDO -> orderItemDO.getSkuId()).collect(Collectors.toSet());
+
+        CommonResult<List<ProductSpuBO>> result = productSpuService.getProductSpuList(skuIds);
+
+        // 校验商品信息
+        if (result.isError()) {
+            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_SKU_FAIL.getCode());
+        }
+
+        if (result.getData() == null) {
+            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_SKU_NOT_EXISTENT.getCode());
+        }
+
+        if (orderItemDTOList.size() != result.getData().size()) {
+            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_GOODS_INFO_INCORRECT.getCode());
+        }
+
+        // 设置 orderItem
+
+        Map<Integer, ProductSpuBO> productSpuBOMap = result.getData()
+                .stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
+
+        for (OrderItemDO orderItemDO : orderItemDOList) {
+            ProductSpuBO productSpuBO = productSpuBOMap.get(orderItemDO.getSkuId());
+            if (productSpuBO.getQuantity() <= 0) {
+                return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_INSUFFICIENT_INVENTORY.getCode());
+            }
+
+            if (productSpuBO.getPrice() <= 0) {
+                return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GOODS_AMOUNT_INCORRECT.getCode());
+            }
+
+            orderItemDO.setSkuImage(Optional.ofNullable(productSpuBO.getPicUrls().get(0)).get());
+            orderItemDO.setSkuName(productSpuBO.getName());
+            orderItemDO.setPrice(productSpuBO.getPrice());
+
+            int payAmount = orderItemDO.getQuantity() * orderItemDO.getPrice();
+            orderItemDO.setPayAmount(payAmount);
+        }

        // order
+        Integer totalAmount = orderCommon.calculatedAmount(orderItemDOList);
        OrderDO orderDO = new OrderDO()
                .setUserId(userId)
                .setOrderNo(UUID.randomUUID().toString().replace("-", ""))
-                .setPayAmount(-1) // 先设置一个默认值，金额在下面计算
+                .setPayAmount(totalAmount)
                .setClosingTime(null)
                .setDeliveryTime(null)
                .setPaymentTime(null)
@@ -173,6 +225,12 @@ public class OrderServiceImpl implements OrderService {
        orderMapper.insert(orderDO);

        // 收件人信息
+        CommonResult<UserAddressBO> userAddressResult = userAddressService.getAddress(userId, orderCreateDTO.getUserAddressId());
+        if (userAddressResult.isError()) {
+            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_USER_ADDRESS_FAIL.getCode());
+        }
+        UserAddressBO userAddressBO = userAddressResult.getData();
+        OrderRecipientDO orderRecipientDO = OrderRecipientConvert.INSTANCE.convert(userAddressBO);
        orderRecipientDO
                .setOrderId(orderDO.getId())
                .setType(OrderRecipientTypeEnum.EXPRESS.getValue())
@@ -183,14 +241,9 @@ public class OrderServiceImpl implements OrderService {

        // order item
        orderItemDOList.forEach(orderItemDO -> {
-            int goodsPrice = 1000; // 商品单价
            orderItemDO
                    .setOrderId(orderDO.getId())
                    .setOrderNo(orderDO.getOrderNo())
-                    .setPrice(goodsPrice)
-                    .setPayAmount(orderItemDO.getQuantity() * orderItemDO.getPrice())
-                    .setSkuName("夏季衣服-默认数据")
-                    .setSkuImage("//img.alicdn.com/tps/i4/TB1TiGwKXXXXXXRXFXXqVMCNVXX-400-400.jpg_350x350q90.jpg_.webp")
                    .setPaymentTime(null)
                    .setDeliveryTime(null)
                    .setReceiverTime(null)
@@ -201,20 +254,31 @@ public class OrderServiceImpl implements OrderService {
                    .setDeleted(DeletedStatusEnum.DELETED_NO.getValue())
                    .setCreateTime(new Date())
                    .setUpdateTime(null);
-
            orderItemMapper.insert(orderItemDO);
        });

-        // 更新订单金额
-        Integer totalAmount = orderCommon.calculatedAmount(orderItemDOList);
-        orderMapper.updateById(
-                new OrderDO()
-                        .setId(orderDO.getId())
-                        .setPayAmount(totalAmount)
+        // 创建预订单
+        // TODO sin 支付订单 orderSubject 暂时取第一个子订单商品信息
+        String orderSubject = orderItemDOList.get(0).getSkuName();
+        Date expireTime = DateUtil.addDate(Calendar.MINUTE, PAY_EXPIRE_TIME);
+        CommonResult commonResult = payTransactionService.createTransaction(
+                new PayTransactionCreateDTO()
+                        .setCreateIp(orderCreateDTO.getIp())
+                        .setAppId(PayAppId.APP_ID_1024)
+                        .setExpireTime(expireTime)
+                        .setPrice(orderDO.getPayAmount())
+                        .setOrderSubject(orderSubject)
+                        .setOrderMemo(orderDO.getRemark())
+                        .setOrderDescription("")
        );

-        // TODO: 2019-03-17 Sin 需要发送 创建成果 MQ 消息
+        if (commonResult.isError()) {
+            //手动开启事务回滚
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_GET_PAY_FAIL.getCode());
+        }

+        // TODO: 2019-03-17 Sin 需要发送 创建成果 MQ 消息，业务扩展和统计
        return CommonResult.success(
                new OrderCreateBO()
                        .setId(orderDO.getId())
--- a/order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml
+++ b/order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml
@@ -3,9 +3,11 @@
 <mapper namespace="cn.iocoder.mall.order.biz.dao.OrderItemMapper">

    <sql id="FIELDS">
-        id, order_id, order_no, sku_id, sku_name, sku_image, quantity, price, pay_amount,
+        id, order_id, order_no, sku_id, sku_name, sku_image, order_logistics_id,
+        quantity, price, pay_amount,
        payment_time, delivery_time, receiver_time, closing_time,
-        has_return_exchange, delivery_type, status, create_time, update_time, deleted
+        has_return_exchange, delivery_type, status,
+        create_time, update_time, deleted
    </sql>

    <!--
@@ -13,11 +15,14 @@
    -->
    <insert id="insert" parameterType="OrderItemDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
        INSERT INTO `order_item` (
-            order_id, order_no, sku_id, sku_name, sku_image, quantity, price, pay_amount,
+            order_id, order_no, sku_id, sku_name, sku_image, order_logistics_id,
+            quantity, price, pay_amount,
            payment_time, delivery_time, receiver_time, closing_time,
-            has_return_exchange, delivery_type, status, create_time, update_time, deleted
+            has_return_exchange, delivery_type, status,
+            create_time, update_time, deleted
        ) VALUES (
-            #{orderId}, #{orderNo}, #{skuId}, #{quantity}, #{price},
+            #{orderId}, #{orderNo}, #{skuId}, #{skuName}, #{skuImage}, #{orderLogisticsId},
+            #{quantity}, #{price}, #{payAmount},
            #{paymentTime}, #{deliveryTime}, #{receiverTime}, #{closingTime},
            #{hasReturnExchange}, #{deliveryType}, #{status},
            #{createTime}, #{updateTime}, #{deleted}
--- a/order/order-service-impl/src/main/resources/mapper/OrderMapper.xml
+++ b/order/order-service-impl/src/main/resources/mapper/OrderMapper.xml
@@ -14,15 +14,15 @@
    -->
    <insert id="insert" parameterType="OrderDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
        INSERT INTO `order` (
-            user_id, order_no, price, payment_time,
+            user_id, order_no, pay_amount, payment_time,
            delivery_time, receiver_time, closing_time,
-            has_return_exchange, status, remark,
-            create_time, update_time, `deleted`
+            has_return_exchange,
+            status, remark, create_time, update_time, `deleted`
        ) VALUES (
-             #{userId}, #{orderNo}, #{price}, #{paymentTime},
+             #{userId}, #{orderNo}, #{payAmount}, #{paymentTime},
             #{deliveryTime}, #{receiverTime}, #{closingTime},
-             #{hasReturnExchange}, #{status}, #{remark},
-             #{createTime}, #{updateTime}, #{deleted}
+             #{hasReturnExchange},
+             #{status}, #{remark}, #{createTime}, #{updateTime}, #{deleted}
        )
    </insert>

--- a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderServiceImplTest.java
+++ b/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderServiceImplTest.java
@@ -36,24 +36,24 @@ public class OrderServiceImplTest {

    @Test
    public void createOrderTest() {
-
-        Integer userId = 1;
-        OrderCreateItemDTO orderCreateItemDTO
-                = new OrderCreateItemDTO()
-                .setSkuId(1)
-                .setQuantity(1);
-
-        CommonResult<OrderCreateBO> result = orderService.createOrder(
-                userId,
-                new OrderCreateDTO()
-                .setRemark("")
-                .setName("张三")
-                .setMobile("13301926050")
-                .setAddress("深圳市福田区")
-                .setAreaNo("1000100")
-                .setOrderItems(Arrays.asList(orderCreateItemDTO)));
-
-        OrderDO orderDO = orderMapper.selectById(result.getData().getId());
-        Assert.assertNotNull("创建的订单不存在!", orderDO);
+//
+//        Integer userId = 1;
+//        OrderCreateItemDTO orderCreateItemDTO
+//                = new OrderCreateItemDTO()
+//                .setSkuId(1)
+//                .setQuantity(1);
+//
+//        CommonResult<OrderCreateBO> result = orderService.createOrder(
+//                userId,
+//                new OrderCreateDTO()
+//                .setRemark("")
+//                .setName("张三")
+//                .setMobile("13301926050")
+//                .setAddress("深圳市福田区")
+//                .setAreaNo("1000100")
+//                .setOrderItems(Arrays.asList(orderCreateItemDTO)));
+//
+//        OrderDO orderDO = orderMapper.selectById(result.getData().getId());
+//        Assert.assertNotNull("创建的订单不存在!", orderDO);
    }
 }