Merge branch 'holiday-price' into dev

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -62,7 +62,8 @@ FROM
 	) AS `f` ON e.order_no = f.order_no
           -->
 
-
+        SELECT wa.* FROM
+        (
         SELECT w.*,o.commission as commission ,<!--o.type--> CASE
         WHEN fcommission>0 THEN
         (CASE
@@ -83,11 +84,11 @@ FROM
         ) o LEFT JOIN ( SELECT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM
         app_user_selling_water WHERE
         id IN ( SELECT MAX( id ) FROM app_user_selling_water GROUP BY order_no)) w
-        ON o.order_no=w.order_no
+        ON o.order_no=w.order_no ) wa
         where 1=1
         <if test="wating!=null">
-            and `waiting`= #{wating} and  <![CDATA[
-                o.`type`<>1 ]]>
+            and  wa.waiting= #{wating} and  <![CDATA[
+                wa.sellerStatus<>1 ]]>
         </if>
         ORDER BY `crt_time` DESC
     </select>