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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -374,17 +374,20 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 sellingWalletVo.setHeadUrl(appUserDetail == null ? "" : appUserDetail.getHeadimgurl());
             }
             //取消单
-            if (Objects.nonNull(sellingWalletVo.getSellerStatus())) {
+            if (sellingWalletVo.getSellerStatus()==1) {
                 sellingWalletVo.setSellerStatus(SellerWallterStatus.CANCEL.getCode());
                 sellingWalletVo.setStatusText(SellerWallterStatus.CANCEL.getText());
+                sellingWalletVo.setIsShow(true);
             }else {
                 if (sellingWalletVo.getWaiting()==SellerWallterStatus.POST.getCode()){
                     sellingWalletVo.setSellerStatus(SellerWallterStatus.POST.getCode());
                     sellingWalletVo.setStatusText(SellerWallterStatus.POST.getText());
+                    sellingWalletVo.setIsShow(false);
                 }
                 if (sellingWalletVo.getWaiting()==SellerWallterStatus.NO_POST.getCode()){
                     sellingWalletVo.setSellerStatus(SellerWallterStatus.NO_POST.getCode());
                     sellingWalletVo.setStatusText(SellerWallterStatus.NO_POST.getText());
+                    sellingWalletVo.setIsShow(false);
                 }
             }
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserBussinessController.java

@@ -2,14 +2,12 @@ package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.UserBusinessBiz;
 import com.github.wxiaoqi.security.admin.bo.PromoteBO;
-import com.github.wxiaoqi.security.admin.bo.UserTeamMemberBo;
 import com.github.wxiaoqi.security.admin.vo.UserTeamMemberVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -14,7 +14,7 @@ FROM
 	`source_id` AS userId,
 	IFNULL(
 	(
-	( SELECT SUM( commission ) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 0 AND `waiting` = 1 ) - ( SELECT SUM( commission ) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 1 AND `waiting` = 1 )
+	( 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 )
 	),
 	0
 	) AS `income`
@@ -33,7 +33,7 @@ FROM
     </select>
 
     <select id="selectSellerWalterByUserIdAndWating" resultType="com.github.wxiaoqi.security.admin.vo.SellingWalletVo">
-        SELECT
+<!--        SELECT
         *
         FROM
         (
@@ -44,13 +44,39 @@ FROM
 		IFNULL(auswt.status,0) AS `isShow`
         FROM
         ( SELECT * FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id`=#{userId} <if test="wating!=null">
-        AND `waiting`=#{wating} <!--AND `status`=0-->
+        AND `waiting`=#{wating} &lt;!&ndash;AND `status`=0&ndash;&gt;
     </if>) AS `ausw`
         LEFT JOIN ( SELECT * FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id`=#{userId} <if
             test="wating!=null">
-        AND `waiting`=#{wating} <!--AND `status`=0-->
+        AND `waiting`=#{wating} &lt;!&ndash;AND `status`=0&ndash;&gt;
     </if>) AS `auswt` ON auswt.order_no = ausw.order_no
         ) AS `auswres`
-        ORDER BY 	crt_time DESC
+        ORDER BY 	crt_time DESC-->
+
+
+        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 order_no,commission  as  z,0 as f FROM app_user_selling_water WHERE user_id=#{userId}
+        AND `status`=0  and commission>0
+        UNION
+        SELECT order_no,0 as z,commission as  f FROM app_user_selling_water WHERE user_id=#{userId}
+        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
+        ON o.order_no=w.order_no
+        where 1=1
+        <choose>
+            <when test="wating!=null">
+                and `waiting`= #{wating}
+            </when>
+            <otherwise>
+                and  <![CDATA[
+                o.`type`<>1
+                ]]>
+            </otherwise>
+        </choose>
+        ORDER BY `crt_time`
     </select>
 </mapper>
\ No newline at end of file