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

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

@@ -7,14 +7,14 @@
       SELECT
    aur.user_id,
    aur.bind_time as `leagueTime`,
-	 ausww.income
+	 IFNULL(ausww.income,0)  AS `income`
 FROM
 	`app_user_relation` AS `aur`
 	LEFT JOIN (SELECT DISTINCT
 	`source_id` AS userId,
 	IFNULL(
 	(
-	( SELECT SUM( commission ) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 0 ) - ( SELECT SUM( commission ) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 1 )
+	( SELECT IFNULL(SUM( commission ),0) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 0 ) - ( SELECT IFNULL(SUM( commission ),0) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 1 )
 	),
 	0
 	) AS `income`
@@ -33,7 +33,7 @@ FROM
     </select>
 
     <select id="selectSellerWalterByUserIdAndWating" resultType="com.github.wxiaoqi.security.admin.vo.SellingWalletVo">
-<!--        SELECT
+        <!--        SELECT
                 *
                 FROM
                 (
@@ -64,7 +64,8 @@ FROM
         AND `status`=1 and commission>0
         ) as t
         GROUP BY t.order_no
-        ) o LEFT JOIN ( SELECT DISTINCT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM app_user_selling_water ) w
+        ) o LEFT JOIN ( SELECT DISTINCT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM
+        app_user_selling_water ) w
         ON o.order_no=w.order_no
         where 1=1
         <if test="wating!=null">