订单详情新增

物流进度新增
用户合并修改

src/main/java/com/peanut/modules/common/controller/BuyOrderController.java

@@ -1,7 +1,6 @@
 package com.peanut.modules.common.controller;
 
 import com.peanut.common.utils.R;
-import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.common.service.BuyOrderService;
 import com.peanut.modules.common.to.PrepareOrderDto;
 import lombok.extern.slf4j.Slf4j;
@@ -9,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -22,21 +20,30 @@ public class BuyOrderController {
 
     @RequestMapping("/initPrepareOrder")
     public R initPrepareOrder(@RequestBody PrepareOrderDto prepareOrderDto){
-        Map<String, Object> stringObjectMap = buyOrderService.initPrepareOrder(prepareOrderDto);
-        return R.ok().put("data",stringObjectMap);
+        return R.ok().put("data",buyOrderService.initPrepareOrder(prepareOrderDto));
     }
 
     //用户订单列表
     @RequestMapping("/buyOrderList")
     public R buyOrderList(@RequestBody Map params){
-        List<BuyOrder> list = buyOrderService.buyOrderList(params);
-        return R.ok().put("data",list);
+        return R.ok().put("data",buyOrderService.buyOrderList(params));
     }
 
     //用户订单各状态下数量
     @RequestMapping("/getBuyOrderNumByStatus")
     public R getBuyOrderNumByStatus(@RequestBody Map params){
-        List<Map<String,Object>> list = buyOrderService.getBuyOrderNumByStatus(params);
-        return R.ok().put("data",list);
+        return R.ok().put("data",buyOrderService.getBuyOrderNumByStatus(params));
+    }
+
+    //订单详情
+    @RequestMapping("/commonOrderDetail")
+    public R commonOrderDetail(@RequestBody Map params){
+        return R.ok().put("data",buyOrderService.commonOrderDetail(params));
+    }
+
+    //获取快递进度详情
+    @RequestMapping("/commonExpressDetail")
+    public R commonExpressDetail(@RequestBody Map params){
+        return R.ok().put("data",buyOrderService.commonExpressDetail(params));
     }
 }