Merge branch 'dev/2024/0424/update-admin' into 'master'

添加用户的详情信息

See merge request zx-mall/mall-backend-admin!7

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ptprofitdailystatisticslog/vo/PtProfitDailyStatisticsLogRespVO.java

@@ -1,5 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofitdailystatisticslog.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -18,6 +19,7 @@ public class PtProfitDailyStatisticsLogRespVO {
 
     @Schema(description = "时间(每日)", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("时间(每日)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate everyday;
 
     @Schema(description = "平台对碰支出", requiredMode = Schema.RequiredMode.REQUIRED)

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/SharePathController.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.distri.controller.admin.sharepath;
 
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -87,6 +88,14 @@ public class SharePathController {
         return success(BeanUtils.toBean(sharePath, SharePathRespVO.class));
     }
 
+    @GetMapping("/getMemberUser")
+    @Operation(summary = "获得会员用户")
+    @Parameter(name = "id", description = "用户编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('member:user:query')")
+    public CommonResult<MemberUserRespVO> getUser(@RequestParam("id") Long userId) {
+        return success(sharePathService.getMemberUser(userId));
+    }
+
     @GetMapping("/getDescendants")
     @Operation(summary = "通过推荐人获得直推人")
     @PreAuthorize("@ss.hasPermission('distri:duser:query')")

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/integral/IntegralService.java

@@ -5,7 +5,6 @@ import javax.validation.*;
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 
 /**
  * 推荐用户积分 Service 接口
@@ -80,5 +79,6 @@ public interface IntegralService {
 
     List<IntegralDO> selectAllUser();
 
+    IntegralDO getIntegralByUserId(Long userId);
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/integral/IntegralServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.service.integral;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
@@ -9,14 +8,12 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.integral.IntegralMapper;
@@ -115,8 +112,15 @@ public class IntegralServiceImpl implements IntegralService {
     @Override
     public List<IntegralDO> selectAllUser() {
 
-        return    integralMapper.selectList();
+        return integralMapper.selectList();
 
     }
 
+    @Override
+    public IntegralDO getIntegralByUserId(Long userId) {
+        return integralMapper.selectOne(new LambdaQueryWrapper<IntegralDO>()
+                .eq(IntegralDO::getUserId, userId)
+        );
+    }
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathService.java

@@ -8,6 +8,7 @@ import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 
 /**
  * 分销用户关系 Service 接口
@@ -102,4 +103,6 @@ public interface SharePathService {
     TreeNode getTree(Long userId,  Integer maxDepth);
 
     TreeNode getTreeByNameOrMobile(SharePathTreeReqVO sharePathTreeReqVO);
+
+    MemberUserRespVO getMemberUser(Long userId);
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -2,12 +2,17 @@ package cn.newfeifan.mall.module.distri.service.sharepath;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
+import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.ordercalc.OrderCalcService;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
+import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +25,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import cn.newfeifan.mall.module.distri.controller.admin.sharepath.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
@@ -53,6 +57,10 @@ public class SharePathServiceImpl implements SharePathService {
     @Resource
     private OrderCalcService orderCalcService;
 
+    @Resource
+    @Lazy
+    private IntegralService integralService;
+
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
         // 插入
@@ -203,6 +211,23 @@ public class SharePathServiceImpl implements SharePathService {
         return getTree(ancestor, sharePathTreeReqVO.getMaxDepth());
     }
 
+    @Override
+    public MemberUserRespVO getMemberUser(Long userId) {
+        MemberUserDO user = memberUserService.getUser(userId);
+        MemberUserRespVO memberUserRespVO = MemberUserConvert.INSTANCE.convert03(user);
+
+        SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapper<SharePathDO>()
+                .eq(SharePathDO::getDescendant, userId)
+                .eq(SharePathDO::getDepth, 1)
+        );
+        if(sharePathDO != null) memberUserRespVO.setAncNickName(sharePathDO.getAncName());
+
+        IntegralDO integral = integralService.getIntegralByUserId(userId);
+        if(integral != null) memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
+
+        return memberUserRespVO;
+    }
+
     private Long getUserIdByNameOrMobile(String name, String mobile) {
         if (!StringUtils.isEmpty(name)) {
             List<DuserDO> duserDOS = duserService.getDuserByName(name);

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -88,4 +88,10 @@ public class MemberUserRespVO extends MemberUserBaseVO {
 
     @Schema(description = "累计消费金额（只算人民币，单位为分）")
     private Long cumulativeSpending;
+
+    @Schema(description = "推荐人名称")
+    private String ancNickName;
+
+    @Schema(description = "当前可用积分")
+    private Long currentQuota;
 }