订单详情新增

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

src/main/java/com/peanut/modules/common/service/BuyOrderService.java

@@ -2,6 +2,7 @@ package com.peanut.modules.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.modules.common.entity.BuyOrder;
+import com.peanut.modules.common.entity.ExpressQueryResponse;
 import com.peanut.modules.common.to.PrepareOrderDto;
 import java.util.List;
 import java.util.Map;
@@ -13,4 +14,8 @@ public interface BuyOrderService extends IService<BuyOrder> {
     List<BuyOrder> buyOrderList(Map params);
 
     List<Map<String,Object>> getBuyOrderNumByStatus(Map params);
+
+    Map<String,Object> commonOrderDetail(Map params);
+
+    ExpressQueryResponse commonExpressDetail(Map params);
 }