后端 + 前端：提交购物车订单

2019-04-14 01:28:41 +08:00
parent b2abc625d1
commit 38b2613add
11 changed files with 146 additions and 38 deletions
--- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersOrderController.java
+++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersOrderController.java
@@ -1,11 +1,15 @@
 package cn.iocoder.mall.order.application.controller.users;

+import cn.iocoder.common.framework.util.HttpUtil;
+import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.order.api.CartService;
 import cn.iocoder.mall.order.api.OrderService;
 import cn.iocoder.mall.order.api.bo.CalcOrderPriceBO;
+import cn.iocoder.mall.order.api.bo.CartItemBO;
 import cn.iocoder.mall.order.api.bo.OrderCreateBO;
 import cn.iocoder.mall.order.api.bo.OrderPageBO;
+import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum;
 import cn.iocoder.mall.order.api.dto.CalcOrderPriceDTO;
 import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
 import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
@@ -19,7 +23,10 @@ import io.swagger.annotations.Api;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;

 /**
 * 订单API(users)
@@ -52,6 +59,31 @@ public class UsersOrderController {
        return orderService.createOrder(orderCreateDTO);
    }

+    @PostMapping("create_order_from_cart")
+    public CommonResult<OrderCreateBO> createOrderFromCart(@RequestParam("userAddressId") Integer userAddressId,
+                                                           @RequestParam(value = "remark", required = false) String remark,
+                                                           HttpServletRequest request) {
+        Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        // 获得购物车中选中的商品
+        List<CartItemBO> cartItems = cartService.list(userId, true).getData();
+        if (cartItems.isEmpty()) {
+            return ServiceExceptionUtil.error(OrderErrorCodeEnum.ORDER_CREATE_CART_IS_EMPTY.getCode());
+        }
+        // 创建 OrderCreateDTO 对象
+        OrderCreateDTO orderCreateDTO = OrderConvertAPP.INSTANCE.createOrderCreateDTO(userId, userAddressId,
+                remark, HttpUtil.getIp(request),
+                cartItems);
+        // 创建订单
+        CommonResult<OrderCreateBO> createResult= orderService.createOrder(orderCreateDTO);
+        if (createResult.isError()) {
+            return CommonResult.error(createResult);
+        }
+        // 清空购物车 // TODO 芋艿，需要标记删除的原因，即结果为创建为某个订单。
+        cartService.deleteList(userId, cartItems.stream().map(CartItemBO::getSkuId).collect(Collectors.toList()));
+        // 返回结果
+        return createResult;
+    }
+
    @GetMapping("confirm_create_order")
    public CommonResult<UsersOrderConfirmCreateVO> getConfirmCreateOrder(@RequestParam("skuId") Integer skuId,
                                                                         @RequestParam("quantity") Integer quantity) {
--- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/convert/OrderConvertAPP.java
+++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/convert/OrderConvertAPP.java
@@ -1,9 +1,7 @@
 package cn.iocoder.mall.order.application.convert;

-import cn.iocoder.mall.order.api.dto.OrderCreateDTO;
-import cn.iocoder.mall.order.api.dto.OrderItemUpdateDTO;
-import cn.iocoder.mall.order.api.dto.OrderLogisticsUpdateDTO;
-import cn.iocoder.mall.order.api.dto.OrderQueryDTO;
+import cn.iocoder.mall.order.api.bo.CartItemBO;
+import cn.iocoder.mall.order.api.dto.*;
 import cn.iocoder.mall.order.application.po.admin.OrderItemUpdatePO;
 import cn.iocoder.mall.order.application.po.admin.OrderLogisticsPO;
 import cn.iocoder.mall.order.application.po.admin.OrderPageQueryPO;
@@ -12,6 +10,8 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;

+import java.util.List;
+
 /**
 * application 订单 convert
 *
@@ -36,4 +36,19 @@ public interface OrderConvertAPP {

    @Mappings({})
    OrderCreateDTO convert(OrderCreatePO orderCreatePO);
+
+    @Mappings({})
+    List<OrderCreateItemDTO> convert(List<CartItemBO> cartItems);
+
+    default OrderCreateDTO createOrderCreateDTO(Integer userId, Integer userAddressId,
+                                                String remark, String ip,
+                                                List<CartItemBO> cartItems) {
+        return new OrderCreateDTO()
+                .setUserId(userId)
+                .setUserAddressId(userAddressId)
+                .setRemark(remark)
+                .setIp(ip)
+                .setOrderItems(this.convert(cartItems));
+    }
+
 }
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/CartService.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/CartService.java
@@ -53,7 +53,7 @@ public interface CartService {
     *
     * @return 是否成功
     */
-    CommonResult<Boolean> delete(Integer userId, List<Integer> skuIds);
+    CommonResult<Boolean> deleteList(Integer userId, List<Integer> skuIds);

    /**
     * 清空购物车
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/CartItemStatusEnum.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/CartItemStatusEnum.java
@@ -6,7 +6,7 @@ public enum CartItemStatusEnum {

    ENABLE(1, "正常"),
    DELETE_BY_MANUAL(2, "主动删除"),
-    DELETE_BY_(3, "下单删除"),
+    DELETE_BY_ORDER(3, "下单删除"),
    ;

    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CartItemStatusEnum::getValue).toArray();
--- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderErrorCodeEnum.java
+++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderErrorCodeEnum.java
@@ -24,6 +24,7 @@ public enum OrderErrorCodeEnum {
    ORDER_GET_PAY_FAIL(1008000010, "调用pay失败!"),
    ORDER_NOT_USER_ORDER(1008000011, "不是该用户的订单!"),
    ORDER_UNABLE_CONFIRM_ORDER(1008000012, "状态不对不能确认订单!"),
+    ORDER_CREATE_CART_IS_EMPTY(1008000013, "购物车无选中的商品，无法创建订单"),

    // order item
    ORDER_ITEM_ONLY_ONE(1008000200, "订单Item只有一个!"),
--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/CartMapper.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/CartMapper.java
@@ -38,8 +38,9 @@ public interface CartMapper {
    int updateQuantity(@Param("id") Integer id,
                       @Param("quantityIncr") Integer quantityIncr);

-    int updateListSelected(@Param("userId") Integer userId,
-                           @Param("skuIds") Collection<Integer> skuIds,
-                           @Param("selected") Boolean selected);
+    int updateListByUserIdAndSkuId(@Param("userId") Integer userId,
+                                   @Param("skuIds") Collection<Integer> skuIds,
+                                   @Param("selected") Boolean selected,
+                                   @Param("status") Integer status);

 }
--- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java
+++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/CartServiceImpl.java
@@ -116,14 +116,17 @@ public class CartServiceImpl implements CartService {
    @Override
    public CommonResult<Boolean> updateSelected(Integer userId, Collection<Integer> skuIds, Boolean selected) {
        // 更新 CartItemDO 们
-        cartMapper.updateListSelected(userId, skuIds, selected);
+        cartMapper.updateListByUserIdAndSkuId(userId, skuIds, selected, null);
        // 返回成功
        return CommonResult.success(true);
    }

    @Override
-    public CommonResult<Boolean> delete(Integer userId, List<Integer> skuIds) {
-        return null;
+    public CommonResult<Boolean> deleteList(Integer userId, List<Integer> skuIds) {
+        // 更新 CartItemDO 们
+        cartMapper.updateListByUserIdAndSkuId(userId, skuIds, null, CartItemStatusEnum.DELETE_BY_MANUAL.getValue());
+        // 返回成功
+        return CommonResult.success(true);
    }

    @Override
--- a/order/order-service-impl/src/main/resources/mapper/CartMapper.xml
+++ b/order/order-service-impl/src/main/resources/mapper/CartMapper.xml
@@ -108,9 +108,16 @@
        WHERE id = #{id}
    </update>

-    <update id="updateListSelected">
+    <update id="updateListByUserIdAndSkuId">
        UPDATE cart_item
-        SET selected = #{selected}
+        <set>
+            <if test="selected != null">
+                selected = #{selected},
+            </if>
+            <if test="status != null">
+                status = #{status},
+            </if>
+        </set>
        WHERE user_id = #{userId}
        AND sku_id IN
            <foreach item="skuId" collection="skuIds" separator="," open="(" close=")" index="">