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

修改用户查看积分的变动,不显示为0的记录

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

@@ -25,7 +25,16 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
 
     default PageResult<PtProfitLogDO> selectPage(PtProfitLogPageReqVO reqVO) {
         //用户只能查看这些类型
-        List<Integer> profitStatus = null;
+        List<Integer> profitStatus;
+
+        LambdaQueryWrapperX<PtProfitLogDO> queryWrapper = new LambdaQueryWrapperX<PtProfitLogDO>()
+                .eqIfPresent(PtProfitLogDO::getAmount, reqVO.getAmount())
+                .eqIfPresent(PtProfitLogDO::getAfterAmount, reqVO.getAfterAmount())
+                .eqIfPresent(PtProfitLogDO::getOrderId, reqVO.getOrderId())
+                .eqIfPresent(PtProfitLogDO::getPercentTemplate, reqVO.getPercentTemplate())
+                .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
+                .orderByDesc(PtProfitLogDO::getCreateTime)
+                .orderByDesc(PtProfitLogDO::getId);
 
         if (!reqVO.getIsFreeze()) {
             //可用
@@ -38,6 +47,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
                     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType()
             );
+            queryWrapper.ne(PtProfitLogDO::getAmount,0);
         } else {
             //冻结
             profitStatus = Arrays.asList(
@@ -48,6 +58,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     ORDER_REFUND_INTEGRAL_CONSUMER.getType(),
                     ORDER_REFUND_INTEGRAL_ANCESTER.getType(),
                     ORDER_PAY_INTEGRAL_CONSUMER.getType());
+            queryWrapper.ne(PtProfitLogDO::getFreezeAmount,0);
         }
 
         if (!reqVO.getIsFreeze() && reqVO.getUserId().equals(PT_ID)) {
@@ -76,15 +87,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
 //            reqVO.setUserId(null);
         }
 
-        LambdaQueryWrapperX<PtProfitLogDO> queryWrapper = new LambdaQueryWrapperX<PtProfitLogDO>()
-                .eqIfPresent(PtProfitLogDO::getAmount, reqVO.getAmount())
-                .eqIfPresent(PtProfitLogDO::getAfterAmount, reqVO.getAfterAmount())
-                .eqIfPresent(PtProfitLogDO::getOrderId, reqVO.getOrderId())
-                .eqIfPresent(PtProfitLogDO::getPercentTemplate, reqVO.getPercentTemplate())
-                .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
-                .inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus)
-                .orderByDesc(PtProfitLogDO::getCreateTime)
-                .orderByDesc(PtProfitLogDO::getId);
+        queryWrapper.inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus);
+
         return selectPage(reqVO, queryWrapper);
     }
 

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

@@ -21,8 +21,7 @@ import cn.newfeifan.mall.module.distri.dal.mysql.ptprofitlog.PtProfitLogMapper;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.newfeifan.mall.module.distri.enums.CaclEnum.RECOMMENDED_PERSON_QUOTA;
-import static cn.newfeifan.mall.module.distri.enums.CaclEnum.SMALL_QUOTA_CRASH;
+import static cn.newfeifan.mall.module.distri.enums.CaclEnum.*;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
 
 /**
@@ -85,7 +84,8 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
             if (ptProfitLogRespVO.getProfitStatus().equals(RECOMMENDED_PERSON_QUOTA.getType()) ||
                     ptProfitLogRespVO.getProfitStatus().equals(CaclEnum.ORDER_PAY_INTEGRAL_ANCESTER.getType()) ||
                     ptProfitLogRespVO.getProfitStatus().equals(CaclEnum.ORDER_REFUND_INTEGRAL_ANCESTER.getType()) ||
-                    ptProfitLogRespVO.getProfitStatus().equals(SMALL_QUOTA_CRASH.getType())) {
+                    ptProfitLogRespVO.getProfitStatus().equals(SMALL_QUOTA_CRASH.getType()) ||
+                    ptProfitLogRespVO.getProfitStatus().equals(SMALL_QUOTA_CRASH_SETTLE.getType())) {
                 ptProfitLogRespVO.setUsername(memberUserService.getUser(ptProfitLogRespVO.getGenerateUserId()).getUsername());
             }
             ptProfitLogRespVO.setProfitStatusName(Objects.requireNonNull(CaclEnum.getCaclEnumByValue(ptProfitLogRespVO.getProfitStatus())).getName());

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

@@ -228,9 +228,12 @@ public class SharePathServiceImpl implements SharePathService {
     private PartitionCrashDO getYesterdayCrash(Long userId, int today) {
         LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT); // 今天的开始时间，即午夜12点
         LocalDateTime localDateTime = todayStart.minusDays(today);
-        String yesterdayNo = "CRASH:" + userId + ":" + localDateTime.toString();
+        String yesterdayNo = "CRASH:" + userId + ":" + localDateTime;
         PartitionCrashDO partitionCrashDO = partitionCrashMapper.selectOne(new LambdaQueryWrapperX<PartitionCrashDO>().eqIfPresent(PartitionCrashDO::getPartNo, yesterdayNo));
-        if(partitionCrashDO == null){
+        List<PartitionCrashDO> partitionCrashDOS = partitionCrashMapper.selectList((new LambdaQueryWrapperX<PartitionCrashDO>().eq(PartitionCrashDO::getUserId, userId)));
+
+        //判断这个用户不是第一次碰撞并且没有查询到昨天的碰撞记录,有可能是昨天或者更早定时任务没有启动导致的,所以再往前查几天
+        if(!partitionCrashDOS.isEmpty() && partitionCrashDO == null){
             return getYesterdayCrash(userId, ++today);
         }
         return partitionCrashDO;