Merge branch 'master-wallet-bug-fix' into dev

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

@@ -55,7 +55,7 @@ FROM
 
 
         SELECT w.*,o.commission as commission ,o.type AS `sellerStatus` FROM (
-        SELECT t.order_no,SUM(t.z)-SUM(t.f) as commission,IF(SUM(t.f)>0,'1',0)as type 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 order_no,commission as z,0 as f FROM app_user_selling_water WHERE user_id=#{userId}
         AND `status`=0 and commission>0