Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -2074,9 +2074,14 @@
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
-        <if test="orderStatus != null and orderStatus.trim() != ''">
-            AND o.order_status = #{orderStatus}
-        </if>
+        <choose>
+            <when test="orderStatus != null and orderStatus.trim() != ''">
+                AND o.order_status = #{orderStatus}
+            </when>
+            <otherwise>
+                AND o.order_status in ('300','401')
+            </otherwise>
+        </choose>
         <if test="isOnfiilineOrder != null">
             AND o.is_onffline_order = #{isOnfiilineOrder}
         </if>