订单筛选条件增加

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

@@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND status = 4
           AND (shopping_points_claimed IS NULL OR shopping_points_claimed = 0)
           AND create_time >= #{cutoffDate}
-          AND create_time <= #{sevenDaysAgo}
+          AND finish_time <= #{sevenDaysAgo}
           AND pay_money > 0
     </select>
 

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

@@ -449,6 +449,7 @@
             <if test="singlePurchaseLimit != null">single_purchase_limit = #{singlePurchaseLimit},</if>
             <if test="activityType != null">activity_type = #{activityType},</if>
             <if test="tagInfo != null and tagInfo != ''">tag_info = #{tagInfo},</if>
+            <if test="tagInfo == null or tagInfo == ''">tag_info = #{tagInfo},</if>
         </trim>
         where product_id = #{productId}
     </update>