修复合并问题

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

@@ -118,7 +118,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
         }
         List<OpOrderExt> rows = new ArrayList<OpOrderExt>();
         for (List<String> orderIdsChunk : orderIdsChunks) {
-            rows.addAll(opOrderExtMapper.getByOrderId(orderIdsChunk));
+            rows.addAll(opOrderExtMapper.getByOrderIds(orderIdsChunk));
         }
         if (ObjectUtil.isEmpty(rows)) {
             return new HashMap<>();

ms-dal/src/main/java/com/ms/dal/mapper/OpOrderExtMapper.java

@@ -26,5 +26,6 @@ public interface OpOrderExtMapper {
     int updateByPrimaryKey(OpOrderExt record);
 
     OpOrderExt getByOrderId(String orderId);
-    List<OpOrderExt> getByOrderId(@Param("orderIds") List<String> orderIds);
+
+    List<OpOrderExt> getByOrderIds(@Param("orderIds") List<String> orderIds);
 }

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

@@ -32,7 +32,7 @@
         from op_order_ext
         where  op_order_ext_id = #{opOrderExtId,jdbcType=BIGINT} 
     </select>
-    <select id="getByOrderId" resultType="com.ms.dal.entity.OpOrderExt">
+    <select id="getByOrderIds" resultType="com.ms.dal.entity.OpOrderExt">
         SELECT * FROM op_order_ext
         WHERE 1 =1
         <if test="orderIds!=null and orderIds.size>0">