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

修改提现时间的范围设定

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

@@ -31,6 +31,7 @@ public enum CaclEnum {
     ORDER_REFUND_ORDER_PAY_FREEZE_HIGH_QUOTA(24, "订单退款-撤回峰值奖","消费者购物,获得冻结峰值"),
     MANUAL_RETURN_INTEGRAL(25, "人工返回最早七天未获得的超出额度的合赢奖","人工返回最早七天未获得的合赢奖,超额的"),
     WITHDRAWAL(26, "用户提现","用户将可用积分提现到账户"),
+    WITHDRAWAL_ERROR(27, "提现失败退回","提现失败退回积分到用户"),
     ;
 
     /**

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

@@ -47,7 +47,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
                     ORDER_CANCEL_BY_SYSTEM_REFUND_INTEGRAL.getType(),
                     MANUAL_RETURN_INTEGRAL.getType(),
-                    WITHDRAWAL.getType()
+                    WITHDRAWAL.getType(),
+                    WITHDRAWAL_ERROR.getType()
             );
             queryWrapper.ne(PtProfitLogDO::getAmount,0);
         } else {
@@ -75,7 +76,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
                     GROSS_PROFIT_ANCESTOR_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
                     MANUAL_RETURN_INTEGRAL.getType(),
-                    WITHDRAWAL.getType()
+                    WITHDRAWAL.getType(),
+                    WITHDRAWAL_ERROR.getType()
             );
             reqVO.setUserId(null);
         } else if (reqVO.getIsFreeze() && reqVO.getUserId().equals(PT_ID)) {

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptdailywithdrawal/PtDailyWithdrawalServiceImpl.java

@@ -80,13 +80,13 @@ public class PtDailyWithdrawalServiceImpl implements PtDailyWithdrawalService {
         // 获取当前时间
         LocalDateTime now = LocalDateTime.now();
 
-        // 获取今天下午五点
-        LocalDateTime todayFivePM = LocalDateTime.of(LocalDate.now(), LocalTime.of(17, 0));
+        // 获取今天下午十点
+        LocalDateTime todayFivePM = LocalDateTime.of(LocalDate.now(), LocalTime.of(22, 0));
 
-        // 获取昨天下午五点
-        LocalDateTime yesterdayFivePM = LocalDate.now().minusDays(1).atTime(17, 0);
+        // 获取昨天下午十点
+        LocalDateTime yesterdayFivePM = LocalDate.now().minusDays(1).atTime(22, 0);
 
-        // 判断当前时间是否在昨天下午五点和今天下午五点之间
+        // 判断当前时间是否在昨天下午十点和今天下午十点之间
         if (now.isAfter(yesterdayFivePM) && now.isBefore(todayFivePM)) {
             PtDailyWithdrawalDO ptDailyWithdrawalDO = ptDailyWithdrawalMapper.selectOne(new LambdaQueryWrapper<PtDailyWithdrawalDO>()
                     .eq(PtDailyWithdrawalDO::getStartTime, yesterdayFivePM)
@@ -108,8 +108,8 @@ public class PtDailyWithdrawalServiceImpl implements PtDailyWithdrawalService {
             return ptDailyWithdrawalDO;
 
         } else {
-            // 获取明天下午五点的时间
-            LocalDateTime tomorrowFivePM = LocalDate.now().plusDays(1).atTime(17, 0);
+            // 获取明天下午十点的时间
+            LocalDateTime tomorrowFivePM = LocalDate.now().plusDays(1).atTime(22, 0);
 
             PtDailyWithdrawalDO ptDailyWithdrawalDO = ptDailyWithdrawalMapper.selectOne(new LambdaQueryWrapper<PtDailyWithdrawalDO>()
                     .eq(PtDailyWithdrawalDO::getStartTime, todayFivePM)

feifan-module-system/feifan-module-system-api/src/main/java/cn/newfeifan/mall/module/system/enums/sms/SmsSceneEnum.java

@@ -21,6 +21,7 @@ public enum SmsSceneEnum implements IntArrayValuable {
     MEMBER_UPDATE_PASSWORD(3, "user-update-password", "会员用户 - 修改密码"),
     MEMBER_RESET_PASSWORD(4, "user-reset-password", "会员用户 - 忘记密码"),
     MEMBER_UPDATE_NEW_MOBILE(5, "user-update-mobile", "会员用户 - 修改手机号时新输入的手机号"),
+    MEMBER_WITHDRAWAL_ERROR(6, "user-withdrawal-error", "会员用户 - 提现失败时发送通知给用户"),
 
     ADMIN_MEMBER_LOGIN(21, "admin-sms-login", "后台用户 - 手机号登录");