chore: 客户详情中订单tag添加字段

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customerDetail/CustomerDetailController.http

@@ -10,4 +10,13 @@ Content-Type: application/json
 GET {{baseUrl}}/customer/detail/infoList/creditScoreStatistic?customerId=34831
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}
+Content-Type: application/json
+
+
+
+
+### 客户报价
+GET {{baseUrl}}/customer/detail/infoList/offerPage?pageNo=1&pageSize=10&total=0&customerId=12925
+Authorization: Bearer {{token}}
+tenant-id: {{adminTenentId}}
 Content-Type: application/json
\ No newline at end of file

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java

@@ -323,9 +323,12 @@ public class OrderBackPageVO {
     @ApiModelProperty(value = "首次入仓时间")
     private Date inTime;
 
-    @ApiModelProperty(value = "已装柜时间")
+    @ApiModelProperty(value = "已装柜时间/到仓时间")
     private Date loadTime;
 
+    @ApiModelProperty(value = "已卸柜时间/出仓时间")
+    private Date unloadTime;
+
 
     /**
      * 渠道名称
@@ -460,6 +463,23 @@ public class OrderBackPageVO {
     private Integer lang;
 
 
+
+
+
+    // -----------start -----------
+    // add 20240825. 客户详情中 订单列表返回的数据
+    @ApiModelProperty(value = "报价单编号 多个以逗号分隔")
+    private String offerNumbers;
+
+    @ApiModelProperty(value = "业绩归属客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "提货数量")
+    private Integer pickNum;
+    // -----------end -----------
+
+
+
     public void setGuanLianOrderStatus(String guanLianOrderStatus) {
         this.guanLianOrderStatus = guanLianOrderStatus;
         if (StringUtils.isNotBlank(guanLianOrderStatus)) {

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -1006,6 +1006,7 @@
         o.is_exception,
         o.create_time,
         o.load_time,
+        o.unload_time,
         (select su.nickname from system_user su where su.deleted = 0 and su.id = o.salesman_id) as salesman_name,
         (select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
         in_time,
@@ -1020,8 +1021,12 @@
         nee.country_code as consignee_country_code,
         if(#{query.lang} = 0, channel.name_zh, channel.name_en) as channel_name,
         o.update_time,
-        #{query.lang} as lang
+        #{query.lang} as lang,
+        (SELECT GROUP_CONCAT(t1.number) FROM ecw_offer t1 WHERE t1.order_id = o.order_id and t1.status = 4) as offer_numbers,
+        c.name as customer_name,
+        (SELECT sum(eop.pick_num) FROM ecw_order_pickup eop WHERE eop.order_id = o.order_no) AS pickNum
         from ecw_order o
+        left join ecw_customer c on o.customer_id = c.id
         left join (
         SELECT
         ewl.id AS line_id,

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.http

@@ -74,7 +74,7 @@ tenant-id: {{adminTenentId}}
 
 
 ### 查询前20条
-GET {{baseUrl}}/ecw/order/customer-order-page?customerDetailId=29572
+GET {{baseUrl}}/ecw/order/customer-order-page?page=2&customerDetailId=12925
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}