Merge branch 'holiday-price' into dev

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

@@ -63,8 +63,15 @@ FROM
           -->
 
 
-        SELECT w.*,o.commission as commission ,o.type AS `sellerStatus` FROM (
-        SELECT t.order_no,IFNULL(SUM(t.z),0)-IFNULL(SUM(t.f),0) as commission,IF(SUM(t.f)>0,'1',0)as type FROM (
+        SELECT w.*,o.commission as commission ,<!--o.type--> CASE
+        WHEN fcommission>0 THEN
+        (CASE
+        WHEN  o.commission=0 THEN 1
+        ELSE 0 END )
+        ELSE 0 END  AS `sellerStatus` FROM (
+        SELECT t.order_no,IFNULL(SUM(t.z),0)-IFNULL(SUM(t.f),0) as commission,<!--IF(SUM(t.f)>0,'1',0)as type -->
+        IFNULL(SUM(t.f), 0) as fcommission
+        FROM (
 
         SELECT order_no,commission as z,0 as f FROM app_user_selling_water WHERE user_id=#{userId}
         AND `status`=0 and commission>0