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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/SellingWalletVo.java

 package com.github.wxiaoqi.security.admin.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -57,8 +58,27 @@ public class SellingWalletVo {
 
     @ApiModelProperty("'类别：0-正；1-负(退款时)")
     private Integer status;
+
+    @JSONField(serialize = false)
+    private Integer sourceId;
+
+    @JSONField(serialize = false)
+    private BigDecimal commissionnm;
     /**
      * 所获佣金
      */
     private BigDecimal commission;
+
+    /**
+     * 订单状态
+     */
+    private Integer sellerStatus;
+    /**
+     * 订单文案
+     */
+    private String statusText;
+    /**
+     * 是否显示 默认false
+     */
+    private Boolean isShow;
 }

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

@@ -5,7 +5,6 @@ import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.bo.UserTeamMemberBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.vo.UserTeamMemberVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.apache.commons.collections.CollectionUtils;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserSellingWaterMapper.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserSellingWater;
+import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -20,4 +21,6 @@ public interface AppUserSellingWaterMapper extends Mapper<AppUserSellingWater> {
     List<UserIncomeBo> accquireIncomeByMemberIds(@Param("parentId") Integer parentId);
 
     BigDecimal selectTotalIncomeByUserId(@Param("userId") Integer userId);
+
+    List<SellingWalletVo> selectSellerWalterByUserIdAndWating(@Param("userId") Integer userId, @Param("wating") Integer wating);
 }

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

@@ -48,4 +48,17 @@ public class UserSellingWaterController {
         }
     }
 
+    @GetMapping("/pagea")
+    public ObjectRestResponse<SellingWalletPagVo> findSellingWaterPagea(@RequestParam(required = false,value = "type") Integer wating,
+                                                                       @RequestParam("pageNo") Integer pageNo,
+                                                                       @RequestParam("pageSize") Integer pageSize,
+                                                                       HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            SellingWalletPagVo sellingWalletPagVo = appUserSellingWaterBiz.findSellingWaterPageForAppByWaiting(wating, Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+            return ObjectRestResponse.succ(sellingWalletPagVo);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
 }

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

@@ -31,4 +31,26 @@ FROM
 	( SELECT IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id` = #{userId}  ) AS `auswu`,
 	( SELECT IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id` = #{userId}  ) AS `auswd`;
     </select>
+
+    <select id="selectSellerWalterByUserIdAndWating" resultType="com.github.wxiaoqi.security.admin.vo.SellingWalletVo">
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+		ausw.*,
+        IFNULL( ausw.commission, 0 ) - IFNULL( auswt.commission, 0 ) AS `commissionnm`,
+		auswt.status AS  sellerStatus,
+		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-->
+    </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-->
+    </if>) AS `auswt` ON auswt.order_no = ausw.order_no
+        ) AS `auswres`
+        ORDER BY 	crt_time DESC
+    </select>
 </mapper>
\ No newline at end of file