增加我的推荐接口

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

@@ -33,4 +33,5 @@ public class UserTeamMemberVo {
 
     private Integer totalPage;
 
+    private Integer totalTeams;
 }

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

@@ -367,6 +367,18 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         return sellingWalletPagVo;
     }
 
+    //查询我的用户佣金
+    public SellingWalletPagVo findSellingWaterPageb(Integer divisionType, Integer userId, Integer pageNo, Integer pageSize) {
+        SellingWalletPagVo sellingWalletPagVo = new SellingWalletPagVo();
+        PageDataVO<SellingWalletVo> pageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findSellingWaterPageb(userId, divisionType));
+        sellingWalletPagVo.setPageNum(pageNo);
+        sellingWalletPagVo.setPageSize(pageSize);
+        sellingWalletPagVo.setSellingWaters(pageDataVO.getData());
+        sellingWalletPagVo.setTotalCount(pageDataVO.getTotalCount().intValue());
+        sellingWalletPagVo.setTotalPage(pageDataVO.getTotalPage());
+        return sellingWalletPagVo;
+    }
+
     public List<Integer> findMemberIdByLeaderIdAndOrdreType(Integer leaderId, int orderType) {
         Example example = new Example(AppUserSellingWater.class);
         Example.Criteria criteria = example.createCriteria();

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

@@ -7,11 +7,13 @@ import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.vo.UserTeamMemberVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -40,6 +42,9 @@ public class UserBusinessBiz {
     @Autowired
     private AppUserDetailBiz appUserDetailBiz;
 
+    @Autowired
+    private BranchCompanyBiz branchCompanyBiz;
+
     public UserTeamMemberVo findTeamMemberPageByUserId(Integer userId, Integer pageNo, Integer pageSize) {
 
         UserTeamMemberVo userTeamMemberVo = new UserTeamMemberVo();
@@ -98,6 +103,72 @@ public class UserBusinessBiz {
         return userTeamMemberVo;
     }
 
+    public UserTeamMemberVo findTeamMemberPageByUserId1(Integer userId, Integer pageNo, Integer pageSize) {
+
+        UserTeamMemberVo userTeamMemberVo = new UserTeamMemberVo();
+
+        //查询推荐的团队
+        Example example = new Example(BranchCompany.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("inviterAccount",userId);
+        criteria.andEqualTo("isDel",0);
+        List<com.github.wxiaoqi.security.admin.entity.BranchCompany> list = branchCompanyBiz.selectByExample(example);
+        userTeamMemberVo.setTotalTeams(list == null ?0:list.size());
+
+        PageDataVO<UserIncomeBo> dataVO = appUserSellingWaterBiz.findMemberIdAndIncomeMapByMemberIds(userId, pageNo, pageSize);
+        List<UserIncomeBo> data = dataVO.getData();
+        if (CollectionUtils.isEmpty(data)) {
+            userTeamMemberVo.setPageNum(pageNo);
+            userTeamMemberVo.setPageSize(pageSize);
+            userTeamMemberVo.setTotalCount(0);
+            userTeamMemberVo.setTotalPage(0);
+            userTeamMemberVo.setTotalIncome(new BigDecimal(0));
+            userTeamMemberVo.setUserTeamMemberBos(Collections.EMPTY_LIST);
+            return userTeamMemberVo;
+        }
+
+        Map<Integer, UserIncomeBo> userIdAndIncomMap = data.stream().collect(Collectors.toMap(UserIncomeBo::getUserId, Function.identity()));
+        List<Integer> memberIds = data.stream().map(UserIncomeBo::getUserId).collect(Collectors.toList());
+        Map<Integer, AppUserLogin> userIdAndAppUserLoginMap = appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(memberIds);
+        Map<Integer, AppUserDetail> userIdAndAppUserDetailMap = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(memberIds);
+
+        List<UserTeamMemberBo> userTeamMemberBos = new ArrayList<>();
+        UserTeamMemberBo userTeamMemberBo;
+        BigDecimal totalIncome = new BigDecimal(0);
+        for (Integer memberId : memberIds) {
+
+            userTeamMemberBo = new UserTeamMemberBo();
+            userTeamMemberBo.setLeagueTime(userIdAndIncomMap.get(memberId).getLeagueTime());
+            userTeamMemberBo.setUserId(memberId);
+
+            if (userIdAndAppUserLoginMap != null) {
+                AppUserLogin appUserLogin = userIdAndAppUserLoginMap.get(memberId);
+                if (appUserLogin == null) {
+                    continue;
+                }
+                userTeamMemberBo.setUserName(appUserLogin.getUsername());
+            }
+            if (userIdAndAppUserDetailMap != null) {
+                AppUserDetail appUserDetail = userIdAndAppUserDetailMap.get(memberId);
+                userTeamMemberBo.setHeadUrl(appUserDetail == null ? "" : appUserDetail.getHeadimgurl());
+                userTeamMemberBo.setNickName(appUserDetail == null ? "" : appUserDetail.getNickname());
+                userTeamMemberBo.setRealName(appUserDetail == null ? "" : appUserDetail.getRealname());
+            }
+            BigDecimal income = userIdAndIncomMap.get(memberId).getIncome() == null ? new BigDecimal(0) : userIdAndIncomMap.get(memberId).getIncome();
+            userTeamMemberBo.setIncome(income);
+            totalIncome = totalIncome.add(income);
+            userTeamMemberBos.add(userTeamMemberBo);
+        }
+        userTeamMemberBos.sort(Comparator.comparing(UserTeamMemberBo::getIncome).reversed());
+        userTeamMemberVo.setPageNum(dataVO.getPageNum());
+        userTeamMemberVo.setPageSize(dataVO.getPageSize());
+        userTeamMemberVo.setTotalCount(dataVO.getTotalCount().intValue());
+        userTeamMemberVo.setTotalPage(dataVO.getTotalPage());
+        userTeamMemberVo.setUserTeamMemberBos(userTeamMemberBos);
+        userTeamMemberVo.setTotalIncome(totalIncome);
+        return userTeamMemberVo;
+    }
+
     public PromoteBO getPromoteBoByUserId(Integer userId) {
 
         PromoteBO promoteBO = new PromoteBO();

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

@@ -34,4 +34,6 @@ public interface AppUserSellingWaterMapper extends Mapper<AppUserSellingWater> {
                                                                              @Param("startTime") Long startTime,
                                                                              @Param("endTime") Long endTime);
     List<AppUserSellingWater> getCommisionByOrder(@Param("orderId") Integer orderId);
+
+    List<SellingWalletVo>findSellingWaterPageb(@Param("userId") Integer userId, @Param("divisionType") Integer divisionType);
 }

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

@@ -46,6 +46,17 @@ public class UserBussinessController {
          }
    }
 
+    @GetMapping("/teams1")
+    public ObjectRestResponse<UserTeamMemberVo> findTeamPage1(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, HttpServletRequest request){
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            UserTeamMemberVo userTeamMemberVo = businessBiz.findTeamMemberPageByUserId1(Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+            return ObjectRestResponse.succ(userTeamMemberVo);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
+
    @GetMapping("/promote")
    public ObjectRestResponse<PromoteBO>  findPromoteBo(HttpServletRequest request){
        try {

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

@@ -68,6 +68,20 @@ public class UserSellingWaterController {
         }
     }
 
+    @GetMapping("/pageb")
+    public ObjectRestResponse<SellingWalletPagVo> findSellingWaterPageb(@RequestParam(required = false,value = "divisionType") Integer divisionType,
+                                                                        @RequestParam("pageNo") Integer pageNo,
+                                                                        @RequestParam("pageSize") Integer pageSize,
+                                                                        HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            SellingWalletPagVo sellingWalletPagVo = appUserSellingWaterBiz.findSellingWaterPageb(divisionType, Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+            return ObjectRestResponse.succ(sellingWalletPagVo);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
+
     @PostMapping("app/unauth/order")
     public ObjectRestResponse order(@RequestBody OrderWaterDTO orderWaterDTO) {
         try {

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

@@ -189,4 +189,22 @@ FROM
         ) r
         GROUP BY r.user_id
     </select>
+
+    <select id="findSellingWaterPageb" resultType="com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO">
+        SELECT
+            wa.user_id AS 'userId',
+            SUM(wa.commission) as commission ,
+            wa.crt_time as crtTime,
+            wa.source_id as sourceId,
+            ul.username as sourceName
+        FROM
+            app_user_selling_water wa
+        LEFT JOIN base_order_accept_detailed bo ON wa.accept_id = bo.id
+        LEFT JOIN app_user_login ul ON wa.source_id = ul.id
+        where wa.waiting = 1
+        and wa.user_id = #{userId}
+        and bo.division_type = #{divisionType}
+        and bo.`status` = 1
+        GROUP BY wa.source_id
+    </select>
 </mapper>
\ No newline at end of file