Merge remote-tracking branch 'origin/main'

ship-module-product/ship-module-product-biz/src/main/resources/mapper/pricevoyage/PriceVoyageMapper.xml

@@ -24,6 +24,7 @@
             t1.deleted = 0
           AND t2.deleted = 0
           AND t3.deleted = 0
+        and t1.shelf_status = 1
         <if test="reqVO.shipId != null and reqVO.shipId != ''">
           and t1.ship_id = #{reqVO.shipId}
         </if>

ship-module-product/ship-module-product-biz/src/main/resources/mapper/voyage/VoyageMapper.xml

@@ -21,12 +21,16 @@
         from product_voyage w
         inner join resource_ship s on w.ship_id = s.id
         inner join resource_route r on w.route_id = r.id
-        where w.deleted = 0 and r.deleted = 0 and s.deleted = 0
+        INNER JOIN product_price_voyage t on w.id = t.voyage_id
+        where w.deleted = 0 and r.deleted = 0 and s.deleted = 0 and t.deleted = 0
+        and w.channel like '%2%'
+        and w.start_time > now()
           <if test="shipId != null and shipId != ''">
               and w.ship_id = #{shipId}
           </if>
           <if test="date != null and date != ''">
-              and DATE_FORMAT(w.start_time,'%Y-%m-%d') = #{date}
+              and w.start_time >= #{date}
+              and w.start_time &lt;= CONCAT(#{date},' 23:59:59')
           </if>
          and w.shelf_status = 1
     </select>