bug修复

ruoyi-shop/src/main/java/com/ruoyi/shop/business/service/impl/UserBusinessRoleServiceImpl.java

@@ -439,6 +439,7 @@ public class UserBusinessRoleServiceImpl implements IUserBusinessRoleService {
 
     @Override
     public TableDataInfo<BusinessIntegralVo> businessPage(UserBusinessRoleBo bo, PageQuery pageQuery) {
+        buildTime(bo);
         Page<BusinessIntegralVo> businessIntegralVoPage = baseMapper.businessPage(bo, pageQuery.build());
         businessIntegralVoPage.setRecords(businessIntegralVoPage.getRecords().stream().map(vo -> {
             vo.setWaitUseIntegral(vo.getTotalGrantIntegral().subtract(vo.getUsedIntegral()));
@@ -447,6 +448,15 @@ public class UserBusinessRoleServiceImpl implements IUserBusinessRoleService {
         return TableDataInfo.build(businessIntegralVoPage);
     }
 
+    private void buildTime(UserBusinessRoleBo bo) {
+        if (ObjectUtil.isNotNull(bo.getStartTime())) {
+            bo.setStartTime(DateUtil.beginOfDay(bo.getStartTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getEndTime())) {
+            bo.setEndTime(DateUtil.endOfDay(bo.getEndTime()));
+        }
+    }
+
     @Override
     public BigDecimal businessTotalIntegral(Long businessId) {
         return baseMapper.businessTotalIntegral(businessId);
@@ -489,6 +499,7 @@ public class UserBusinessRoleServiceImpl implements IUserBusinessRoleService {
 
     @Override
     public List<BusinessIntegralVo> businessList(UserBusinessRoleBo bo) {
+        buildTime(bo);
         List<BusinessIntegralVo> businessIntegralVos = baseMapper.businessList(bo);
         return businessIntegralVos.stream().map(vo -> {
             vo.setWaitUseIntegral(vo.getTotalGrantIntegral().subtract(vo.getUsedIntegral()));

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/BalanceToIntegralBo.java

@@ -3,6 +3,8 @@ package com.ruoyi.user.domain.bo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -11,11 +13,14 @@ public class BalanceToIntegralBo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("店铺id")
+    @NotNull(message = "店铺id不能为空")
     private Long businessId;
 
     @ApiModelProperty("转积分数")
+    @NotNull(message = "转积分数不能为空")
     private BigDecimal integral;
 
     @ApiModelProperty("支付密码")
+    @NotBlank(message = "支付密码不能为空")
     private String payPassword;
 }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -428,6 +428,10 @@ public class UserServiceImpl implements IUserService {
         }
 
         User user = this.getById(userThirdIdentity.getUserId(), true);
+        //如果用户被禁用，则不能登录
+        if (!user.getStatus()) {
+            throw new ServiceException(ExceptionEnum.USER_DISABLED);
+        }
         user.setLastLoginTime(new Date());
         this.baseMapper.updateById(user);
         return user;
@@ -499,7 +503,10 @@ public class UserServiceImpl implements IUserService {
         wxUserDto.setMobile(bo.getMobile());
         wxUserDto.setNickname(bo.getNickname());
         User user = registerOrLogin(wxUserDto, null, null);
-
+        //如果用户被禁用，则不能登录
+        if (!user.getStatus()) {
+            throw new ServiceException(ExceptionEnum.USER_DISABLED);
+        }
         UserLoginVo userLoginVo = new UserLoginVo();
         userLoginVo.setUser(user);
         userLoginVo.setIsReg(wxUserDto.getIsReg());