'1'

twzd-admin/src/main/java/com/miaxis/pc/controller/extension/PcWxExtensionIncomeController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 import com.miaxis.spread.service.IWxSpreadRelationService;
@@ -43,8 +44,8 @@ public class PcWxExtensionIncomeController extends BaseController {
      */
     @GetMapping(value = "/extensionPoints")
     @ApiOperation("查询下级推广积分")
-    public Response<List<ExtensionIncomeVo>> getDownLevelPoints(String openid) {
-        List<ExtensionIncomeVo> list = userInfoService.getDownLevelPoints(openid);
+    public Response<List<ExtensionIncomeVo>> getDownLevelPoints(ExtensionIncomeListDTO dto) {
+        List<ExtensionIncomeVo> list = userInfoService.getPcDownLevelPoints(dto);
         return Response.success(list);
     }
 

twzd-service/src/main/java/com/miaxis/extension/dto/ExtensionIncomeListDTO.java

@@ -0,0 +1,23 @@
+package com.miaxis.extension.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ */
+@Data
+@ApiModel(value = "ExtensionSettleDTO", description = "结算参数对象")
+public class ExtensionIncomeListDTO {
+
+
+    @ApiModelProperty(value = "微信openid",required = true)
+    private String openid;
+
+    @ApiModelProperty(value = "排序 1-按总推广积分 2-按未结算推广积分 3-按已结算推广积分 4-推广人数")
+    private Integer sortBy;
+
+    @ApiModelProperty(value = "字段名称",hidden = true)
+    private String sortByParmName;
+
+}

twzd-service/src/main/java/com/miaxis/user/mapper/UserInfoMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 
 import java.util.List;
@@ -29,4 +30,6 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
     UserInfo getUpUserInfo(String fromUserName);
 
     List<ExtensionIncomeVo> getDownLevelPoints(String openid);
+
+    List<ExtensionIncomeVo> getPcDownLevelPoints(ExtensionIncomeListDTO dto);
 }

twzd-service/src/main/java/com/miaxis/user/service/IUserInfoService.java

@@ -2,6 +2,7 @@ package com.miaxis.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface IUserInfoService extends IService<UserInfo>{
     UserInfo getUpUserInfo(String fromUserName);
 
     List<ExtensionIncomeVo> getDownLevelPoints(String openid);
+
+    List<ExtensionIncomeVo> getPcDownLevelPoints(ExtensionIncomeListDTO dto);
 }

twzd-service/src/main/java/com/miaxis/user/service/impl/UserInfoServiceImpl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,4 +47,22 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     public List<ExtensionIncomeVo> getDownLevelPoints(String openid) {
         return userInfoMapper.getDownLevelPoints(openid);
     }
+
+    @Override
+    public List<ExtensionIncomeVo> getPcDownLevelPoints(ExtensionIncomeListDTO dto) {
+        if (dto.getSortBy()!= null){
+            if (dto.getSortBy() == 1){
+                dto.setSortByParmName("achievement_total");
+            }else if (dto.getSortBy() == 2){
+                dto.setSortByParmName("achievement");
+            }else if (dto.getSortBy() == 3){
+                dto.setSortByParmName("achievement_settled");
+            }else if (dto.getSortBy() == 4){
+                dto.setSortByParmName("extension_count");
+            }else{
+                throw new CustomException("sortBy值不合法");
+            }
+        }
+        return userInfoMapper.getPcDownLevelPoints(dto);
+    }
 }

twzd-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -76,4 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where openid in (select openid from wx_spread_relation where parent_openid = #{openid})
     </select>
 
+    <select id="getPcDownLevelPoints"  resultType="com.miaxis.extension.vo.ExtensionIncomeVo">
+        select openid,IFNULL(nick_name,'未知') as nick_name,IFNULL(head_image,'未知') as head_image,achievement+achievement_settled as achievement_total,achievement,achievement_settled,
+        (select count(1) from wx_spread_relation where parent_openid =t1.openid) as extension_count from user_info t1
+        where openid in (select openid from wx_spread_relation where parent_openid = #{openid})
+        <if test="sortByParmName != null  and sortByParmName != ''"> order by ${sortByParmName} desc</if>
+    </select>
+
 </mapper>