修改部分问题

ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java

@@ -45,7 +45,7 @@ public enum ResponseCode {
     /**
      * 账号已过期
      */
-    ACCOUNT_EXPIRED("1020","账号已过期"),
+    ACCOUNT_EXPIRED("1020","账号已过期,无法激活"),
     /**
      * 呼叫失败
      */

manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java

@@ -236,10 +236,11 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
     /**
      * 时间查找过期用户
      * @param date
+     * @param flag
      * @return
      */
-    @Query(value = "from User where expirationTime < ?1")
-    List<User> findUserByTime(DateTime date);
+    @Query(value = "from User where expirationTime < ?1 and enabled = ?2")
+    List<User> findUserByTime(DateTime date,Boolean flag);
 
     /**
      * id修改用户状态

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/AliPayController.java

@@ -42,12 +42,9 @@ public class AliPayController {
      * @param request request
      * @return 返回结果
      */
-    @RequestMapping(value = "/pay-notify")
+    @RequestMapping(value = "/pay-notify", produces = "text/html;charset=utf-8")
     public ResponseEntity<String> frontRcvResponse(HttpServletRequest request) {
-        return new ResponseEntity<>(aliPayService.pcNotifyResponse(request),HttpStatus.OK);
+        return new ResponseEntity<>(aliPayService.pcNotifyResponse(request), HttpStatus.OK);
     }
 
-
-
-
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserService.java

@@ -207,6 +207,7 @@ public interface UserService {
      * 过期时间查找
      * @return
      * @param date
+     * @param flag
      */
-    List<User> findUserByExpirationTime(DateTime date);
+    List<User> findUserByExpirationTime(DateTime date, Boolean flag);
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/AliPayServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.alipay.easysdk.factory.Factory;
 import com.alipay.easysdk.kernel.util.ResponseChecker;

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayOrderServiceImpl.java

@@ -82,7 +82,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                         (dtoList.size(), DefaultNumberConstants.THIRTY);
                 double subAmount = NumberUtil.sub(userBalance, minusAmount);
                 // 判断余额
-                if (userBalance == null || subAmount <= DefaultNumberConstants.ZERO_NUMBER) {
+                if (userBalance == null || subAmount < DefaultNumberConstants.ZERO_NUMBER) {
                     throw new BadRequestException(ResponseCode.INSUFFICIENT_ACCOUNT_BALANCE.getDesc());
                 }
                 // 异步插入数据

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -17,7 +17,6 @@ package com.baiye.modules.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -218,7 +217,11 @@ public class UserServiceImpl implements UserService {
                     DateTime dateTime = DateUtil.offsetMonth
                             (user.getExpirationTime() != null
                                     ? user.getExpirationTime() : DateUtil.date(), DefaultNumberConstants.ONE_NUMBER);
-                    user.setExpirationTime(DateUtil.endOfDay(dateTime));
+                    if (user.getEnabled() != null
+                            && !user.getEnabled()) {
+                        user.setEnabled(Boolean.TRUE);
+                    }
+                    user.setExpirationTime(DateUtil.beginOfDay(dateTime));
                     userRepository.save(user);
                 }
             }
@@ -226,8 +229,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<User> findUserByExpirationTime(DateTime date) {
-        return userRepository.findUserByTime(date);
+    public List<User> findUserByExpirationTime(DateTime date, Boolean flag) {
+        return userRepository.findUserByTime(date, flag);
     }
 
 

manage/ad-platform-management/src/main/java/com/baiye/timed/UserBalanceTask.java

@@ -27,12 +27,11 @@ public class UserBalanceTask {
     private final UserService userService;
 
     /**
-     * 自动归档消息
-     * 每天执行一次，超过7天的消息 自动归档
+     * 过期账号自动设置过期
      */
     @Scheduled(cron = "0 0 1 * * ?")
     public void checkUserBalance() {
-        List<User> companyList = userService.findUserByExpirationTime(DateUtil.date());
+        List<User> companyList = userService.findUserByExpirationTime(DateUtil.date(), Boolean.TRUE);
         if (CollUtil.isNotEmpty(companyList)) {
             List<Long> userIds = companyList.stream().map(User::getId).collect(Collectors.toList());
             userService.updateUserStatusByCompanyId(Boolean.FALSE, userIds);