集运包裹主页修改

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

@@ -147,4 +147,10 @@ public class ConsQueryVO {
 
     @ApiModelProperty(value = "发货人(发货人手机号、客户编号)")
     private String customerKey;
+
+    @ApiModelProperty(value = "发货人名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "跟进客服")
+    private List<Long> salesmanIds;
 }

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

@@ -76,6 +76,49 @@
             AND concat(IFNULL(cons.`customer_number`,''), IFNULL(eccs.`phone_new`,'')) like
             concat("%",concat(#{query.customerKey},"%"))
         </if>
+        <if test="query.customerName != null and query.customerName != '' ">
+            AND ec.name like concat("%",concat(#{query.customerName},"%"))
+        </if>
+        <if test="query.transportId != null">
+            AND cons.`transport_id` = #{query.transportId}
+        </if>
+        <if test="query.consigneeCityId != null">
+            AND cons.`consignee_city_id` = #{query.consigneeCityId}
+        </if>
+        <if test="query.consigneeCountryId != null">
+            AND cons.`consignee_country_id` = #{query.consigneeCountryId}
+        </if>
+        <if test="query.salesmanIds != null and query.salesmanIds.size()>0">
+
+            <if test="query.salesmanIds != null and query.salesmanIds.size()==1 ">
+                AND (o.`salesman_id` =
+                <foreach item='salesmanId' index="index" collection='query.salesmanIds'>
+                    #{salesmanId}
+                </foreach>
+                or
+                o.`customer_id` in(select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
+                cus.customer_service =
+                <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
+                    #{salesmanId}
+                </foreach>
+                ))
+            </if>
+
+            <if test="query.salesmanIds != null and query.salesmanIds.size()>1 ">
+                AND (o.`salesman_id` in
+                <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
+                    #{salesmanId}
+                </foreach>
+                or
+                o.`customer_id` in (select cus.id from ecw_customer cus where cus.is_customer_service_confirmed = 1 and
+                cus.customer_service in
+                <foreach item='salesmanId' index="index" collection='query.salesmanIds' open='(' separator=',' close=')'>
+                    #{salesmanId}
+                </foreach>
+                )
+                )
+            </if>
+        </if>
     </sql>
 
 </mapper>
\ No newline at end of file