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

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

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -28,7 +28,8 @@ public enum CaclEnum {
     ORDER_PAY_INTEGRAL_CONSUMER(21, "购物获得","消费者购物,获得冻结积分"),//购物者本人 获得积分
     SMALL_QUOTA_CRASH_SETTLE(22, "合赢奖结算获得","每天计算的合赢奖7天后结算"),
     ORDER_PAY_FREEZE_HIGH_QUOTA(23, "购物获得","消费者购物,获得冻结峰值"),
-    ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA(24, "订单退款-撤回峰值奖","消费者购物,获得冻结峰值")
+    ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA(24, "订单退款-撤回峰值奖","消费者购物,获得冻结峰值"),
+    MANUAL_RETURN_INTEGRAL(25, "人工返回最早七天未获得的超出额度的合赢奖","人工返回最早七天未获得的合赢奖,超额的")
     ;
 
     /**

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

@@ -45,7 +45,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     ORDER_PAY_INTEGRAL.getType(),
                     ORDER_REFUND_INTEGRAL.getType(),
                     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
-                    ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType()
+                    ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType(),
+                    MANUAL_RETURN_INTEGRAL.getType()
             );
             queryWrapper.ne(PtProfitLogDO::getAmount,0);
         } else {
@@ -71,7 +72,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     AFTER_CRASH_CALC_PT_TOTAL_QUOTA.getType(),
                     AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA.getType(),
                     GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
-                    GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType()
+                    GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
+                    MANUAL_RETURN_INTEGRAL.getType()
             );
             reqVO.setUserId(null);
         } else if (reqVO.getIsFreeze() && reqVO.getUserId().equals(PT_ID)) {
@@ -98,7 +100,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                 RECOMMENDED_PERSON_QUOTA.getType(),
                 SMALL_QUOTA_CRASH.getType(),
                 ORDER_PAY_FREEZE_HIGH_QUOTA.getType(),
-                ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA.getType());
+                ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA.getType(),
+                MANUAL_RETURN_INTEGRAL.getType());
         return selectPage(pageReqVO, new LambdaQueryWrapperX<PtProfitLogDO>()
                 .eqIfPresent(PtProfitLogDO::getUserId, pageReqVO.getUserId())
                 .inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus)

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

@@ -85,6 +85,7 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                     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(MANUAL_RETURN_INTEGRAL.getType()) ||
                     ptProfitLogRespVO.getProfitStatus().equals(SMALL_QUOTA_CRASH_SETTLE.getType())) {
                 ptProfitLogRespVO.setUsername(memberUserService.getUser(ptProfitLogRespVO.getGenerateUserId()).getUsername());
             }