Merge remote-tracking branch 'origin/point_dev' into point_dev

nightFragrance-massage/src/main/resources/mapper/massage/ProductOrderInfoMapper.xml

@@ -140,6 +140,10 @@
         <if test="dto.logisticsNo != null and dto.logisticsNo != ''">
             AND oi.logistics_no LIKE CONCAT('%', #{dto.logisticsNo}, '%')
         </if>
+        <!-- 根据需求：1：待发货 2：待收货 3：已收货 4：售后中 -->
+        <if test="dto.orderStatus == null">
+            AND oi.order_status IN (1, 2, 3, 4)
+        </if>
         <if test="dto.orderStatus != null">
             AND oi.order_status = #{dto.orderStatus}
         </if>