From 38b2613add0361422029cf9a853fdc626394b4cb Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Sun, 14 Apr 2019 01:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=20+=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=EF=BC=9A=E6=8F=90=E4=BA=A4=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/api/order.js                   | 25 ++++++-
 mobile-web/src/page/cart/index.vue            |  2 +-
 mobile-web/src/page/shipping/order.vue        | 70 +++++++++++++------
 .../users/UsersOrderController.java           | 32 +++++++++
 .../application/convert/OrderConvertAPP.java  | 23 ++++--
 .../iocoder/mall/order/api/CartService.java   |  2 +-
 .../api/constant/CartItemStatusEnum.java      |  2 +-
 .../api/constant/OrderErrorCodeEnum.java      |  1 +
 .../mall/order/biz/dao/CartMapper.java        |  7 +-
 .../order/biz/service/CartServiceImpl.java    |  9 ++-
 .../src/main/resources/mapper/CartMapper.xml  | 11 ++-
 11 files changed, 146 insertions(+), 38 deletions(-)

diff --git a/mobile-web/src/api/order.js b/mobile-web/src/api/order.js
index faefcb6b2..72fdb1f6f 100644
--- a/mobile-web/src/api/order.js
+++ b/mobile-web/src/api/order.js
@@ -21,7 +21,7 @@ export function confirmReceiving(orderId) {
   });
 }
 
-export function getConfirmCreateOrder(skuId, quantity) {
+export function getOrderConfirmCreateOrder(skuId, quantity) {
   return request({
     url: '/order-api/users/order/confirm_create_order',
     method: 'get',
@@ -45,6 +45,18 @@ export function createOrder(params) {
   });
 }
 
+export function createOrderFromCart(userAddressId,
+                                    remark) {
+  return request({
+    url: '/order-api/users/order/create_order_from_cart',
+    method: 'post',
+    params: {
+      userAddressId,
+      remark,
+    }
+  });
+}
+
 // Cart
 
 export function addCart(skuId, quantity) {
@@ -87,6 +99,17 @@ export function updateCartSelected(skuIds, selected) {
   });
 }
 
+export function getCartConfirmCreateOrder(skuId, quantity) {
+  return request({
+    url: '/order-api/users/cart/confirm_create_order',
+    method: 'get',
+    params: {
+      skuId,
+      quantity,
+    }
+  });
+}
+
 // 物流信息
 
 export function getLogisticsInfo(params) {
diff --git a/mobile-web/src/page/cart/index.vue b/mobile-web/src/page/cart/index.vue
index 33136d849..47cce44fb 100644
--- a/mobile-web/src/page/cart/index.vue
+++ b/mobile-web/src/page/cart/index.vue
@@ -157,7 +157,7 @@ export default {
       })
     },
     onSubmit() {
-      this.$router.push('/order')
+      this.$router.push('/order?from=cart')
     },
     convertProduct(item) {
       // debugger;
diff --git a/mobile-web/src/page/shipping/order.vue b/mobile-web/src/page/shipping/order.vue
index 7cb647b6e..5e6fea44d 100644
--- a/mobile-web/src/page/shipping/order.vue
+++ b/mobile-web/src/page/shipping/order.vue
@@ -68,7 +68,12 @@
 
 <script>
 
-  import {createOrder, getConfirmCreateOrder} from '../../api/order';
+  import {
+    createOrder,
+    getOrderConfirmCreateOrder,
+    getCartConfirmCreateOrder,
+    createOrderFromCart
+  } from '../../api/order';
   import {GetDefaultAddress} from '../../api/user';
   import orderStore from '../../store/order'
 
@@ -96,30 +101,43 @@
     },
     methods: {
       onSubmit() {
-        const { skuId, quantity } = this.$route.query;
         const userAddressId = this.addressData.id;
         const remark = '';
 
-        const orderItems = [{
-          skuId,
-          quantity,
-        }];
-
-        createOrder({
-          orderItems,
-          userAddressId,
-          remark,
-        }).then(result => {
-          if (result) {
-            const { orderNo } = result;
-            this.$router.push({  //核心语句
-              path:`/order/success`,   //跳转的路径
-              query:{           //路由传参时push和query搭配使用 ，作用时传递参数
-                ...result,
+        if (this.from === 'direct_order') {
+            const { skuId, quantity } = this.$route.query;
+            const orderItems = [{
+              skuId,
+              quantity,
+            }];
+            createOrder({
+              orderItems,
+              userAddressId,
+              remark,
+            }).then(result => {
+              if (result) {
+                const { orderNo } = result;
+                this.$router.push({  //核心语句
+                  path:`/order/success`,   //跳转的路径
+                  query:{           //路由传参时push和query搭配使用 ，作用时传递参数
+                    ...result,
+                  }
+                });
               }
             });
-          }
-        })
+        } else if (this.from === 'cart') {
+          createOrderFromCart(userAddressId, remark).then(result => {
+            if (result) {
+              const { orderNo } = result;
+              this.$router.push({  //核心语句
+                path:`/order/success`,   //跳转的路径
+                query:{           //路由传参时push和query搭配使用 ，作用时传递参数
+                  ...result,
+                }
+              });
+            }
+          });
+        }
       },
       convertProduct(item) {
         // debugger;
@@ -143,13 +161,18 @@
       this.addressData = this.$store.state.addressData;
 
       // 加载商品信息
+      // debugger;
       if (this.from === 'direct_order') {
-        getConfirmCreateOrder(this.skuId, this.quantity).then(data => {
+        getOrderConfirmCreateOrder(this.skuId, this.quantity).then(data => {
+          this.itemGroups = data.itemGroups;
+          this.fee = data.fee;
+        })
+      } else if (this.from === 'cart') {
+        getCartConfirmCreateOrder().then(data => {
           this.itemGroups = data.itemGroups;
           this.fee = data.fee;
         })
       }
-
     },
     created() {
       // 加载地址
@@ -160,6 +183,9 @@
         }
       })
       // 处理来源
+      if (this.$route.query.from === 'cart') {
+        this.from = this.$route.query.from;
+      }
     },
     store: orderStore,
   };
diff --git 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
index 2f305c2e9..f042c1686 100644
--- 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) {
diff --git 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
index 031e02bcc..66c15b9b9 100644
--- 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));
+    }
+
 }
diff --git 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
index 19b9e9a72..6b5fa741e 100644
--- 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);
 
     /**
      * 清空购物车
diff --git 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
index cc9a96dd5..d43588d72 100644
--- 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();
diff --git 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
index 076e705e3..2363f78ee 100644
--- 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只有一个!"),
diff --git 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
index b77c5a9c8..d5b9bf4e7 100644
--- 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);
 
 }
diff --git 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
index ae7cc6e7c..e945703a7 100644
--- 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
diff --git a/order/order-service-impl/src/main/resources/mapper/CartMapper.xml b/order/order-service-impl/src/main/resources/mapper/CartMapper.xml
index 99f65ea40..7d9a28f38 100644
--- 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="">