- 添加确认订单

- 添加查看物流

order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/OrderLogisticsController.java

@@ -0,0 +1,35 @@
+package cn.iocoder.mall.order.application.controller.users;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.order.api.OrderLogisticsService;
+import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoBO;
+import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 订单物流 controller
+ *
+ * @author Sin
+ * @time 2019-04-12 22:24
+ */
+@RestController
+@RequestMapping("users/order_logistics")
+@Api(description = "订单物流信息")
+public class OrderLogisticsController {
+
+    @Autowired
+    private OrderLogisticsService orderLogisticsService;
+
+    @GetMapping("logistics_info")
+    @ApiOperation("物流详细 - 返回订单所关联的所有物流信息")
+    public CommonResult<OrderLogisticsInfoBO> logisticsInfo(@RequestParam("orderId") Integer orderId) {
+        Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        return orderLogisticsService.logisticsInfo(userId, orderId);
+    }
+}

order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/users/UsersOrderController.java

@@ -15,6 +15,7 @@ import cn.iocoder.mall.order.application.po.user.OrderCreatePO;
 import cn.iocoder.mall.order.application.vo.UsersOrderConfirmCreateVO;
 import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
 import com.alibaba.dubbo.config.annotation.Reference;
+import io.swagger.annotations.Api;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +29,7 @@ import java.util.Collections;
  */
 @RestController
 @RequestMapping("users/order")
+@Api(description = "用户订单")
 public class UsersOrderController {
 
     @Reference(validation = "true")
@@ -50,7 +52,7 @@ public class UsersOrderController {
         return orderService.createOrder(orderCreateDTO);
     }
 
-    @GetMapping("/confirm_create_order")
+    @GetMapping("confirm_create_order")
     public CommonResult<UsersOrderConfirmCreateVO> getConfirmCreateOrder(@RequestParam("skuId") Integer skuId,
                                                                          @RequestParam("quantity") Integer quantity) {
         // 创建 CalcOrderPriceDTO 对象，并执行价格计算
@@ -64,4 +66,10 @@ public class UsersOrderController {
         return CommonResult.success(CartConvert.INSTANCE.convert(calcOrderPriceResult.getData()));
     }
 
+    @PostMapping("confirm_receiving")
+    public CommonResult confirmReceiving(@RequestParam("orderId") Integer orderId) {
+        Integer userId = UserSecurityContextHolder.getContext().getUserId();
+        return orderService.confirmReceiving(userId, orderId);
+    }
+
 }