分车优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjzdetail/OrderJzDispatchServiceImpl.java

@@ -77,11 +77,13 @@ public class OrderJzDispatchServiceImpl implements OrderJzDispatchService {
         String dispatchNo = info.getDispatchNo();
         String groupNo = info.getGroupNo();
         Long voyageId = info.getVoyageId();
+        Integer sourceType = info.getSourceType(); // 1.接站 2.赠送接站
 
         // 根据条件查找已有的分车记录：分车号+分车组团号+航次ID，或分车号+航次ID
         LambdaQueryWrapper<OrderJzDispatchDO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(OrderJzDispatchDO::getDispatchNo, dispatchNo)
-                .eq(OrderJzDispatchDO::getVoyageId, voyageId);
+                .eq(OrderJzDispatchDO::getVoyageId, voyageId)
+        .eq(OrderJzDispatchDO::getSourceType, sourceType);
         if (StrUtil.isNotBlank(groupNo)) {
             queryWrapper.eq(OrderJzDispatchDO::getGroupNo, groupNo);
         }
@@ -227,7 +229,8 @@ public class OrderJzDispatchServiceImpl implements OrderJzDispatchService {
        // if (StrUtil.isNotBlank(updateReqVO.getGroupNo())) {
             updateWrapper.eq(OrderJzDispatchDO::getDispatchNo, updateReqVO.getDispatchNo())
                     .eq(OrderJzDispatchDO::getGroupNo, updateReqVO.getGroupNo())
-                    .eq(OrderJzDispatchDO::getVoyageId, updateReqVO.getVoyageId());
+                    .eq(OrderJzDispatchDO::getVoyageId, updateReqVO.getVoyageId())
+            .eq(OrderJzDispatchDO::getSourceType, updateReqVO.getSourceType());
             /*.eq(OrderJzDispatchDO::getId, updateReqVO.getId());*/
         //} else {
             // 如果没有分车组团号，通过分车号、id两个条件更新

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdispatch/OrderJzDispatchMapper.xml

@@ -79,6 +79,9 @@
             <if test="reqVO.dispatchNo != null and reqVO.dispatchNo != ''">
                 AND tojd.dispatch_no LIKE CONCAT('%', #{reqVO.dispatchNo}, '%')
             </if>
+            <if test="reqVO.sourceType != null">
+                AND tojd.source_type = #{reqVO.sourceType}
+            </if>
         </where>
         GROUP BY tojd.dispatch_no,tojd.group_no
         ORDER BY MAX(tojd.id) DESC
@@ -104,6 +107,9 @@
             <if test="reqVO.dispatchNo != null and reqVO.dispatchNo != ''">
                 AND tojd.dispatch_no LIKE CONCAT(#{reqVO.dispatchNo}, '%')
             </if>
+            <if test="reqVO.sourceType != null">
+                AND tojd.source_type = #{reqVO.sourceType}
+            </if>
         </where>
         GROUP BY tojd.dispatch_no, tojd.group_no
         ) t