合并问题处理

ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -37,6 +38,7 @@ import com.ms.api.consts.TblConst;
 import com.ms.api.dto.order.AllowAutoPurchaseProductDTO;
 import com.ms.api.dto.order.DsPurchaseSettingDTO;
 import com.ms.api.dto.order.FilterAutoPurchaseProductDTO;
+import com.ms.api.dto.order.OrderMultiPackageOutstorageDTO;
 import com.ms.api.dto.order.PurchaseSettingDTO;
 import com.ms.api.dto.order.SearchDsOrderFilterDTO;
 import com.ms.api.service.AfterSaleService;

ms-dal/src/main/resources/mapper/OpOrderDsMapper.xml

@@ -130,4 +130,24 @@
             gmt_modified =  #{gmtModified,jdbcType=TIMESTAMP}
         where   op_order_ds_id = #{opOrderDsId,jdbcType=BIGINT} 
     </update>
+
+    <select id="getByOrderId" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from op_order_ds
+        where  order_id = #{orderId,jdbcType=VARCHAR}
+    </select>
+    <delete id="deleteByOrderId" parameterType="java.lang.String">
+        delete from op_order_ds
+        where  order_id = #{opOrderDsId,jdbcType=VARCHAR}
+    </delete>
+    <select id="getListByOrderIds" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from op_order_ds
+        where  order_id in
+        <foreach collection="list" item="orderId" index="index" open="(" close=")" separator=",">
+            #{orderId}
+        </foreach>
+    </select>
 </mapper>