订单查询 合并订单增加数量

fs-service/src/main/resources/mapper/hisStore/FsStoreProductPackageScrmMapper.xml

@@ -136,8 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                             </if>
                                              <if test="companyId !=null">
                                                  company_id = #{companyId},
-                                                 products = null
+                                                 products = null,
                                              </if>
+                                                 store_id = null
                                          where package_id in
         <foreach item="packageId" collection="packageIds" open="(" separator="," close=")">
             #{packageId}

fs-service/src/main/resources/mapper/hisStore/MergedOrderMapper.xml

@@ -119,12 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND DATE(delivery_import_time) BETWEEN SUBSTRING_INDEX(#{maps.deliveryImportTimeRange}, '--', 1) AND SUBSTRING_INDEX(#{maps.deliveryImportTimeRange}, '--', -1)
           </if>
         ORDER BY create_time DESC
-        <if test="maps.pageSize != null and maps.pageSize > 0">
-          LIMIT #{maps.pageSize}
-          <if test="maps.offset != null and maps.offset >= 0">
-            OFFSET #{maps.offset}
-          </if>
-        </if>
+        limit 1000
       ) o
       left join ( SELECT fsois.*, ROW_NUMBER() OVER ( PARTITION BY fsois.order_id ORDER BY fsois.item_id ) AS rn FROM fs_store_order_item_scrm fsois ) item_latest ON item_latest.order_id = o.id and item_latest.rn = 1
       LEFT JOIN fs_user u ON o.user_id = u.user_id
@@ -164,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
           group by o.id
           UNION ALL
-          -- 商城订单（没有company_user_id的商城订单）
+
       SELECT
       o.id,
       '商城订单' AS order_type_name,
@@ -278,12 +273,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND DATE(delivery_import_time) BETWEEN SUBSTRING_INDEX(#{maps.deliveryImportTimeRange}, '--', 1) AND SUBSTRING_INDEX(#{maps.deliveryImportTimeRange}, '--', -1)
           </if>
         ORDER BY create_time DESC
-        <if test="maps.pageSize != null and maps.pageSize > 0">
-          LIMIT #{maps.pageSize}
-          <if test="maps.offset != null and maps.offset >= 0">
-            OFFSET #{maps.offset}
-          </if>
-        </if>
+      limit 1000
       ) o
         left join ( SELECT fsois.*, ROW_NUMBER() OVER ( PARTITION BY fsois.order_id ORDER BY fsois.item_id ) AS rn FROM fs_store_order_item_scrm fsois ) item_latest ON item_latest.order_id = o.id and item_latest.rn = 1
       LEFT JOIN fs_user u ON o.user_id = u.user_id
@@ -434,12 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND DATE(delivery_send_time) BETWEEN SUBSTRING_INDEX(#{maps.deliverySendTimeRange}, '--', 1) AND SUBSTRING_INDEX(#{maps.deliverySendTimeRange}, '--', -1)
           </if>
         ORDER BY create_time DESC
-        <if test="maps.pageSize != null and maps.pageSize > 0">
-          LIMIT #{maps.pageSize}
-          <if test="maps.offset != null and maps.offset >= 0">
-            OFFSET #{maps.offset}
-          </if>
-        </if>
+      limit 1000
       ) o
       left join live_order_item loi on loi.order_id = o.order_id
       LEFT JOIN fs_user u ON o.user_id = u.user_id