bug修复

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -123,7 +123,16 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         wrapper.orderByDesc("jo", JdOrder::getId);
 
         wrapper.like(ObjectUtil.isNotNull(dto.getOrderId()),"jo.order_id",dto.getOrderId());
-        wrapper.like(ObjectUtil.isNotNull(dto.getWareId()),"jod.ware_id",dto.getWareId());
+
+        List<Long> jdOrderIdList = new ArrayList<>();
+        if(ObjectUtil.isNotNull(dto.getWareId())){
+            List<JdOrderDetails> list = jdOrderDetailsService.lambdaQuery().like(JdOrderDetails::getWareId, dto.getWareId()).list();
+            if(CollectionUtil.isNotEmpty(list)){
+                jdOrderIdList = list.stream().map(JdOrderDetails::getJdOrderId).distinct().collect(Collectors.toList());
+            }
+        }
+
+        wrapper.in(CollectionUtil.isNotEmpty(jdOrderIdList), "jo.id", jdOrderIdList);
         wrapper.eq(StrUtil.isNotBlank(dto.getBusinessStatus()),"jo.business_status",dto.getBusinessStatus());
         wrapper.eq(ObjectUtil.isNotNull(dto.getIsCanConfirm()),"jo.is_can_confirm",dto.getIsCanConfirm());
         wrapper.eq("jo", JdOrder::getState, dto.getState());

hx-victoriatourist/src/main/resources/mapper/jd/JdOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.victoriatourist.mapper.jd.JdOrderMapper">
     <select id="getPage" resultType="com.fjhx.victoriatourist.entity.jd.vo.JdOrderVo">
-        select distinct
+        select
             jo.id,
             jo.code,
             jo.customer_id,
@@ -56,7 +56,6 @@
             jo.tc_flag_name,
             jo.book_time
         from jd_order jo
-            LEFT JOIN jd_order_details jod ON jod.jd_order_id = jo.id
             <!--LEFT JOIN jd_order_details jod ON jod.jd_order_id = jo.id
             LEFT JOIN bytesailing_item.product_info pi ON jod.product_id = pi.id
             LEFT JOIN bytesailing_base.sys_dept de ON CAST(json_unquote(pi.victoriatourist_json -> '$.deptId') AS UNSIGNED) = de.dept_id-->