Merge branch 'dev/2024/0529/update-app-Y' of feifan/mall-backend-app into master

修改查看积分详情

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/ptprofitlog/PtProfitLogController.java

@@ -6,6 +6,7 @@ import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
 import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
+import cn.newfeifan.mall.framework.security.core.annotations.PreAuthenticated;
 import cn.newfeifan.mall.module.distri.controller.app.ptprofitlog.vo.PtProfitLogPageReqVO;
 import cn.newfeifan.mall.module.distri.controller.app.ptprofitlog.vo.PtProfitLogRespVO;
 import cn.newfeifan.mall.module.distri.controller.app.ptprofitlog.vo.PtProfitLogSaveReqVO;
@@ -71,10 +72,18 @@ public class PtProfitLogController {
 
     @GetMapping("/page")
     @Operation(summary = "获得平台利润记录分页")
+    @PreAuthenticated
     public CommonResult<PageResult<PtProfitLogRespVO>> getPtProfitLogPage(@Valid PtProfitLogPageReqVO pageReqVO) {
         PageResult<PtProfitLogRespVO> pageResult = ptProfitLogService.getPtProfitLogPage(pageReqVO);
         return success(pageResult);
     }
+    @GetMapping("/getMaxAmountPage")
+    @Operation(summary = "获得峰值记录分页")
+    @PreAuthenticated
+    public CommonResult<PageResult<PtProfitLogRespVO>> getMaxAmountPage(@Valid PtProfitLogPageReqVO pageReqVO) {
+        PageResult<PtProfitLogRespVO> pageResult = ptProfitLogService.getMaxAmountPage(pageReqVO);
+        return success(pageResult);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出平台利润记录 Excel")

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/ptprofitlog/vo/PtProfitLogPageReqVO.java

@@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -50,6 +49,5 @@ public class PtProfitLogPageReqVO extends PageParam {
     private String percentTemplate;
 
     @Schema(description = "是否冻结  true-冻结  false-可用")
-    @NotNull(message = "是否冻结不能为空")
     private Boolean isFreeze;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/ptprofitlog/vo/PtProfitLogRespVO.java

@@ -59,4 +59,16 @@ public class PtProfitLogRespVO {
     @ExcelProperty("计算百分比模板")
     private String percentTemplate;
 
+    @Schema(description = "最大可用积分变化值")
+    private Long maxAvailablePointsAmount;
+
+    @Schema(description = "最大可用积分额度")
+    private Long afterMaxAvailablePointsAmount;
+
+    @Schema(description = "合赢奖超出额度")
+    private Long accumulatedQuotaAmount;
+
+    @Schema(description = "直推奖超出额度")
+    private Long ancestorQuotaAmount;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/sharepath/vo/SharePathRespVO.java

@@ -69,4 +69,7 @@ public class SharePathRespVO {
 
     @Schema(description = "后代人数")
     private Long descendantsCount;
+
+    @Schema(description = "最高可获取积分(峰值 / 最大值)")
+    private Long high_quota;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptprofitlog/PtProfitLogDO.java

@@ -61,5 +61,22 @@ public class PtProfitLogDO extends BaseDO {
      */
     private String percentTemplate;
 
+    /**
+     * 最大可用积分变化值
+     */
+    private Long maxAvailablePointsAmount;
+    /**
+     * 最大可用积分额度
+     */
+    private Long afterMaxAvailablePointsAmount;
+    /**
+     * 合赢奖超出额度
+     */
+    private Long accumulatedQuotaAmount;
+    /**
+     * 直推奖超出额度
+     */
+    private Long ancestorQuotaAmount;
+
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofitlog/PtProfitLogMapper.java

@@ -69,4 +69,15 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                 .orderByDesc(PtProfitLogDO::getCreateTime);
         return selectPage(reqVO, queryWrapper);
     }
+
+    default PageResult<PtProfitLogDO> getMaxAmountPage(PtProfitLogPageReqVO pageReqVO){
+        List<Integer> profitStatus = Arrays.asList(
+                DIRECT_REFERRAL_QUOTA.getType(),
+                RECOMMENDED_PERSON_QUOTA.getType(),
+                SMALL_QUOTA_CRASH.getType());
+        return selectPage(pageReqVO, new LambdaQueryWrapperX<PtProfitLogDO>()
+                .eqIfPresent(PtProfitLogDO::getUserId, pageReqVO.getUserId())
+                .inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus)
+                .orderByDesc(PtProfitLogDO::getCreateTime));
+    }
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/duser/DuserServiceImpl.java

@@ -10,6 +10,7 @@ import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusD
 import cn.newfeifan.mall.module.distri.dal.mysql.orderpercentage.OrderPercentageMapper;
 import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
+import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
 import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
 import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
@@ -31,6 +32,7 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.duser.DuserMapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 
@@ -116,6 +118,9 @@ public class DuserServiceImpl implements DuserService {
     @Resource
     private SocialStatusService socialStatusService;
 
+    @Resource
+    private OrderPercentageService orderPercentageService;
+
     @Override
     public void hasUserAndCreat(SharePathSaveReqVO saveReqVO) {
         checkAndCreat(saveReqVO.getDescendant());
@@ -143,6 +148,10 @@ public class DuserServiceImpl implements DuserService {
         if (integral == null) {
             throw exception(INTEGRAL_NOT_EXISTS);
         }
+
+        OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
+        integral.setHighQuota(integral.getHighQuota() + new BigDecimal(orderPercentageDO.getBaseMaxQuota()).longValue());
+
         DuserInfoVO.DuserInfoVOBuilder duserInfoVOBuilder = DuserInfoVO.builder()
                 .integralDO(integral)
                 .descNo(sonsId.size());

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogService.java

@@ -68,4 +68,5 @@ public interface PtProfitLogService {
 
     String getTotalLog(List<Long> sonsId);
 
+    PageResult<PtProfitLogRespVO> getMaxAmountPage(PtProfitLogPageReqVO pageReqVO);
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogServiceImpl.java

@@ -81,6 +81,16 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
         return result;
     }
 
+    @Override
+    public PageResult<PtProfitLogRespVO> getMaxAmountPage(PtProfitLogPageReqVO pageReqVO) {
+        pageReqVO.setUserId(getLoginUserId());
+        PageResult<PtProfitLogRespVO> result = BeanUtils.toBean(ptProfitLogMapper.getMaxAmountPage(pageReqVO), PtProfitLogRespVO.class);
+        for (PtProfitLogRespVO ptProfitLogRespVO : result.getList()) {
+            ptProfitLogRespVO.setProfitStatusName(Objects.requireNonNull(CaclEnum.getCaclEnumByValue(ptProfitLogRespVO.getProfitStatus())).getName());
+        }
+        return result;
+    }
+
     @Override
     public void saveBatch(List<PtProfitLogSaveReqVO> ptProfitLogSaveReqVOS) {
         List<PtProfitLogDO> ptProfitLog = BeanUtils.toBean(ptProfitLogSaveReqVOS, PtProfitLogDO.class);

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

@@ -4,11 +4,13 @@ import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.controller.app.sharepath.vo.*;
 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.orderpercentage.OrderPercentageDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
 import cn.newfeifan.mall.module.distri.dal.mysql.orderpercentage.OrderPercentageMapper;
 import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 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.socialstatus.SocialStatusService;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
@@ -61,6 +63,9 @@ public class SharePathServiceImpl implements SharePathService {
     @Resource
     private OrderPercentageMapper orderPercentageMapper;
 
+    @Resource
+    private IntegralService integralService;
+
 
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
@@ -148,6 +153,14 @@ public class SharePathServiceImpl implements SharePathService {
         if(ancestor != null) {
             ancestor.setAvatar(getAvatar(ancestor.getAncestor()));
             getSocialStatus(ancestor, ancestor.getAncestor());
+            //获取最大可用额度
+            setHighQuota(ancestor, ancestor.getAncestor());
+
+            //获取团队数
+            Long descendantsCount = sharePathMapper.selectCount(new LambdaQueryWrapper<SharePathDO>()
+                    .eq(SharePathDO::getAncestor, ancestor.getAncestor())
+            );
+            ancestor.setDescendantsCount(descendantsCount);
         }
 
         //获取团队成员
@@ -165,6 +178,10 @@ public class SharePathServiceImpl implements SharePathService {
                     .eq(SharePathDO::getAncestor, item.getDescendant())
             );
             item.setDescendantsCount(descendantsCount);
+
+            //获取最大可用额度
+            setHighQuota(item, item.getDescendant());
+
         });
 
 
@@ -174,6 +191,18 @@ public class SharePathServiceImpl implements SharePathService {
                 .descendants(result).build();
     }
 
+    /**
+     * 获取最高可获取积分
+     * @param sharePath 对象
+     * @param userId 用户编号
+     */
+    private void setHighQuota(SharePathRespVO sharePath,Long userId){
+        IntegralDO integralDO = integralService.selectByUser(userId);
+        if(integralDO != null){
+            sharePath.setHigh_quota(integralDO.getHighQuota());
+        }
+    }
+
     private void getSocialStatus(SharePathRespVO sharePathRespVO,Long userId){
         if(Objects.equals(userId, PT_ID)) return;
         DuserDO duser = duserService.getDuserByUser(userId);