【feat】【第二版开发】

1.优化代码结构
2.移除无效代码

src/main/java/com/punchsettle/server/atomic/entity/LotteryScratchRecord.java

@@ -1,18 +1,19 @@
 package com.punchsettle.server.atomic.entity;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import com.punchsettle.server.common.pojo.BaseEntity;
 import com.punchsettle.server.common.typehandler.EnumValueTypeHandler;
 import com.punchsettle.server.constant.ScratchActionTypeEnum;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import tk.mybatis.mapper.annotation.ColumnType;
 
-import java.io.Serial;
-import java.io.Serializable;
-import java.math.BigDecimal;
-
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/entity/PunchIn.java

@@ -4,7 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalTime;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 import com.punchsettle.server.common.typehandler.EnumValueTypeHandler;
 import com.punchsettle.server.constant.PunchInCategoryEnum;
 import com.punchsettle.server.constant.PunchInRuleEnum;

src/main/java/com/punchsettle/server/atomic/entity/PunchInRecord.java

@@ -4,12 +4,12 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalTime;
 
-import com.punchsettle.server.common.entity.BaseEntity;
-
+import com.punchsettle.server.common.pojo.BaseEntity;
 import com.punchsettle.server.common.typehandler.EnumValueTypeHandler;
 import com.punchsettle.server.constant.PunchInCategoryEnum;
 import com.punchsettle.server.constant.PunchInRuleEnum;
 import com.punchsettle.server.constant.PunchInStatusEnum;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
 import lombok.Data;

src/main/java/com/punchsettle/server/atomic/entity/PunchInRecordSettlementRela.java

@@ -3,16 +3,12 @@ package com.punchsettle.server.atomic.entity;
 import java.io.Serial;
 import java.io.Serializable;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 
-import com.punchsettle.server.common.typehandler.EnumValueTypeHandler;
-import com.punchsettle.server.constant.PunchInCategoryEnum;
-import com.punchsettle.server.constant.PunchInRuleEnum;
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import tk.mybatis.mapper.annotation.ColumnType;
 
 /**
  * @description 打卡任务记录与结算关联表 实体

src/main/java/com/punchsettle/server/atomic/entity/PunchInSettlement.java

@@ -4,7 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;

src/main/java/com/punchsettle/server/atomic/entity/SettlementNotifyTask.java

@@ -4,7 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;

src/main/java/com/punchsettle/server/atomic/entity/SettlementTask.java

@@ -4,7 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;

src/main/java/com/punchsettle/server/atomic/entity/SysDict.java

@@ -1,14 +1,15 @@
 package com.punchsettle.server.atomic.entity;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import java.io.Serial;
+import java.io.Serializable;
+
+import com.punchsettle.server.common.pojo.BaseEntity;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serial;
-import java.io.Serializable;
-
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/entity/SysDictItem.java

@@ -1,14 +1,15 @@
 package com.punchsettle.server.atomic.entity;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import java.io.Serial;
+import java.io.Serializable;
+
+import com.punchsettle.server.common.pojo.BaseEntity;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serial;
-import java.io.Serializable;
-
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/entity/User.java

@@ -4,7 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;

src/main/java/com/punchsettle/server/atomic/entity/UserClaimRewardRecord.java

@@ -4,7 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;

src/main/java/com/punchsettle/server/atomic/mapper/LotteryScratchRecordMapper.java

@@ -1,6 +1,7 @@
 package com.punchsettle.server.atomic.mapper;
 
 import com.punchsettle.server.atomic.entity.LotteryScratchRecord;
+
 import tk.mybatis.mapper.common.Mapper;
 
 /**

src/main/java/com/punchsettle/server/atomic/mapper/PunchInRecordSettlementRelaMapper.java

@@ -1,6 +1,7 @@
 package com.punchsettle.server.atomic.mapper;
 
 import com.punchsettle.server.atomic.entity.PunchInRecordSettlementRela;
+
 import tk.mybatis.mapper.common.special.InsertListMapper;
 
 /**

src/main/java/com/punchsettle/server/atomic/mapper/SysDictItemMapper.java

@@ -1,6 +1,7 @@
 package com.punchsettle.server.atomic.mapper;
 
 import com.punchsettle.server.atomic.entity.SysDictItem;
+
 import tk.mybatis.mapper.common.BaseMapper;
 
 /**

src/main/java/com/punchsettle/server/atomic/mapper/SysDictMapper.java

@@ -1,6 +1,7 @@
 package com.punchsettle.server.atomic.mapper;
 
 import com.punchsettle.server.atomic.entity.SysDict;
+
 import tk.mybatis.mapper.common.BaseMapper;
 
 /**

src/main/java/com/punchsettle/server/atomic/service/ILotteryScratchRecordService.java

@@ -1,10 +1,10 @@
 package com.punchsettle.server.atomic.service;
 
-import com.punchsettle.server.atomic.entity.LotteryScratchRecord;
-import com.punchsettle.server.dto.scratch.ScratchQuery;
-
 import java.util.List;
 
+import com.punchsettle.server.atomic.entity.LotteryScratchRecord;
+import com.punchsettle.server.pojo.scratch.ScratchQuery;
+
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/service/IPunchInRecordService.java

@@ -3,7 +3,7 @@ package com.punchsettle.server.atomic.service;
 import java.util.List;
 
 import com.punchsettle.server.atomic.entity.PunchInRecord;
-import com.punchsettle.server.dto.punchin.PunchInRecordQuery;
+import com.punchsettle.server.pojo.punchin.PunchInRecordQuery;
 
 /**
  * @author tyuio

src/main/java/com/punchsettle/server/atomic/service/IPunchInService.java

@@ -3,7 +3,7 @@ package com.punchsettle.server.atomic.service;
 import java.util.List;
 
 import com.punchsettle.server.atomic.entity.PunchIn;
-import com.punchsettle.server.dto.punchin.PunchInQuery;
+import com.punchsettle.server.pojo.punchin.PunchInQuery;
 
 /**
  * @author tyuio

src/main/java/com/punchsettle/server/atomic/service/IPunchInSettlementService.java

@@ -3,7 +3,7 @@ package com.punchsettle.server.atomic.service;
 import java.util.List;
 
 import com.punchsettle.server.atomic.entity.PunchInSettlement;
-import com.punchsettle.server.dto.settle.SettleQuery;
+import com.punchsettle.server.pojo.settle.SettleQuery;
 
 /**
  * @author tyuio

src/main/java/com/punchsettle/server/atomic/service/IUserClaimRewardRecordService.java

@@ -1,10 +1,10 @@
 package com.punchsettle.server.atomic.service;
 
-import com.punchsettle.server.atomic.entity.UserClaimRewardRecord;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordQuery;
-
 import java.util.List;
 
+import com.punchsettle.server.atomic.entity.UserClaimRewardRecord;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordQuery;
+
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/service/impl/LotteryScratchRecordServiceImpl.java

@@ -1,19 +1,21 @@
 package com.punchsettle.server.atomic.service.impl;
 
+import java.util.List;
+import java.util.Objects;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
 import com.punchsettle.server.atomic.entity.LotteryScratchRecord;
 import com.punchsettle.server.atomic.mapper.LotteryScratchRecordMapper;
 import com.punchsettle.server.atomic.service.ILotteryScratchRecordService;
 import com.punchsettle.server.common.utils.Assert;
-import com.punchsettle.server.dto.scratch.ScratchQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
+import com.punchsettle.server.pojo.scratch.ScratchQuery;
+
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
-import java.util.List;
-import java.util.Objects;
-
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInRecordServiceImpl.java

@@ -6,14 +6,14 @@ import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import com.punchsettle.server.atomic.entity.PunchInRecord;
 import com.punchsettle.server.atomic.mapper.PunchInRecordMapper;
 import com.punchsettle.server.atomic.service.IPunchInRecordService;
 import com.punchsettle.server.common.utils.Assert;
-import com.punchsettle.server.dto.punchin.PunchInRecordQuery;
+import com.punchsettle.server.pojo.punchin.PunchInRecordQuery;
 
-import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInRecordSettlementRelaServiceImpl.java

@@ -2,14 +2,13 @@ package com.punchsettle.server.atomic.service.impl;
 
 import java.util.List;
 
-import com.punchsettle.server.common.utils.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import com.punchsettle.server.atomic.entity.PunchInRecordSettlementRela;
 import com.punchsettle.server.atomic.mapper.PunchInRecordSettlementRelaMapper;
 import com.punchsettle.server.atomic.service.IPunchInRecordSettlementRelaService;
+import com.punchsettle.server.common.utils.Assert;
 
 /**
  * @author tyuio

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInServiceImpl.java

@@ -3,8 +3,6 @@ package com.punchsettle.server.atomic.service.impl;
 import java.util.List;
 import java.util.Objects;
 
-import com.punchsettle.server.dto.punchin.PunchInDto;
-import com.punchsettle.server.dto.punchin.PunchInQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -13,6 +11,7 @@ import com.punchsettle.server.atomic.entity.PunchIn;
 import com.punchsettle.server.atomic.mapper.PunchInMapper;
 import com.punchsettle.server.atomic.service.IPunchInService;
 import com.punchsettle.server.common.utils.Assert;
+import com.punchsettle.server.pojo.punchin.PunchInQuery;
 
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;

src/main/java/com/punchsettle/server/atomic/service/impl/PunchInSettlementServiceImpl.java

@@ -11,7 +11,7 @@ import com.punchsettle.server.atomic.entity.PunchInSettlement;
 import com.punchsettle.server.atomic.mapper.PunchInSettlementMapper;
 import com.punchsettle.server.atomic.service.IPunchInSettlementService;
 import com.punchsettle.server.common.utils.Assert;
-import com.punchsettle.server.dto.settle.SettleQuery;
+import com.punchsettle.server.pojo.settle.SettleQuery;
 
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;

src/main/java/com/punchsettle/server/atomic/service/impl/SysDictItemServiceImpl.java

@@ -1,8 +1,9 @@
 package com.punchsettle.server.atomic.service.impl;
 
-import com.punchsettle.server.atomic.service.ISysDictItemService;
 import org.springframework.stereotype.Service;
 
+import com.punchsettle.server.atomic.service.ISysDictItemService;
+
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/service/impl/SysDictServiceImpl.java

@@ -1,8 +1,9 @@
 package com.punchsettle.server.atomic.service.impl;
 
-import com.punchsettle.server.atomic.service.ISysDictService;
 import org.springframework.stereotype.Service;
 
+import com.punchsettle.server.atomic.service.ISysDictService;
+
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/atomic/service/impl/UserClaimRewardRecordServiceImpl.java

@@ -5,14 +5,14 @@ import java.util.Objects;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import com.punchsettle.server.atomic.entity.UserClaimRewardRecord;
 import com.punchsettle.server.atomic.mapper.UserClaimRewardRecordMapper;
 import com.punchsettle.server.atomic.service.IUserClaimRewardRecordService;
 import com.punchsettle.server.common.utils.Assert;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordQuery;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordQuery;
 
-import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 

src/main/java/com/punchsettle/server/atomic/service/impl/UserServiceImpl.java

@@ -3,16 +3,16 @@ package com.punchsettle.server.atomic.service.impl;
 import java.util.List;
 import java.util.Objects;
 
-import com.punchsettle.server.common.utils.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.punchsettle.server.atomic.entity.User;
 import com.punchsettle.server.atomic.mapper.UserMapper;
 import com.punchsettle.server.atomic.service.IUserService;
+import com.punchsettle.server.common.utils.Assert;
 
 import io.micrometer.common.util.StringUtils;
-import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 

src/main/java/com/punchsettle/server/common/entity/BaseEntity.java → src/main/java/com/punchsettle/server/common/pojo/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.common.entity;
+package com.punchsettle.server.common.pojo;
 
 import java.sql.Timestamp;
 

src/main/java/com/punchsettle/server/common/pojo/BaseQuery.java

@@ -0,0 +1,38 @@
+package com.punchsettle.server.common.pojo;
+
+import org.springframework.util.StringUtils;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author tyuio
+ * @version 1.0.0
+ * @description 基础查询类
+ * @date 2024/12/19 23:24
+ */
+@Data
+@EqualsAndHashCode
+public class BaseQuery {
+
+    @NotBlank(message = "开始时间不能为空")
+    private String startDate;
+
+    @NotBlank(message = "结束时间不能为空")
+    private String endDate;
+
+    public String getStartDate() {
+        if (StringUtils.hasText(startDate) && startDate.length() > 10) {
+            return String.format("%s 00:00:00.000", startDate);
+        }
+        return startDate;
+    }
+
+    public String getEndDate() {
+        if (StringUtils.hasText(endDate) && endDate.length() > 10) {
+            return String.format("%s 00:00:00.000", startDate);
+        }
+        return endDate;
+    }
+}

src/main/java/com/punchsettle/server/common/dto/JsonResponse.java → src/main/java/com/punchsettle/server/common/pojo/JsonResponse.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.common.dto;
+package com.punchsettle.server.common.pojo;
 
 import java.io.Serial;
 import java.io.Serializable;

src/main/java/com/punchsettle/server/common/typehandler/EnumValueTypeHandler.java

@@ -1,15 +1,16 @@
 package com.punchsettle.server.common.typehandler;
 
-import com.punchsettle.server.common.annotation.EnumValue;
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-
 import java.lang.reflect.Field;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import com.punchsettle.server.common.annotation.EnumValue;
+
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/constant/CacheConstant.java

@@ -9,9 +9,4 @@ public class CacheConstant {
      * 微信小程序用户 session_key
      */
     public static final String WECHAT_MINI_PROGRAM_SESSION_KEY = "WECHAT:MINI-PROGRAM:SESSION-KEY";
-
-    /**
-     * 系统用户访问凭据（token）
-     */
-    public static final String SYSTEM_USER_TOKEN = "SYSTEM:USER:TOKEN";
 }

src/main/java/com/punchsettle/server/constant/PunchInCategoryEnum.java

@@ -2,6 +2,7 @@ package com.punchsettle.server.constant;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.punchsettle.server.common.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/punchsettle/server/constant/PunchInRuleEnum.java

@@ -2,6 +2,7 @@ package com.punchsettle.server.constant;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.punchsettle.server.common.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -16,9 +17,7 @@ import lombok.Getter;
 public enum PunchInRuleEnum {
 
     GREATER_OR_EQUAL("大于等于", 0),
-    LESS_OR_EQUAL("小于等于", 1),
-    GREATER("大于", 2),
-    LESS("小于", 3)
+    LESS_OR_EQUAL("小于等于", 1)
     ;
 
     /**

src/main/java/com/punchsettle/server/constant/PunchInStatusEnum.java

@@ -2,6 +2,7 @@ package com.punchsettle.server.constant;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.punchsettle.server.common.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/punchsettle/server/constant/PunchInStatusViewEnum.java

@@ -1,6 +1,7 @@
 package com.punchsettle.server.constant;
 
 import com.fasterxml.jackson.annotation.JsonValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/punchsettle/server/constant/ScratchActionTypeEnum.java

@@ -2,6 +2,7 @@ package com.punchsettle.server.constant;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.punchsettle.server.common.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/punchsettle/server/core/aop/GlobalExceptionHandler.java

@@ -10,9 +10,9 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import com.punchsettle.server.common.dto.JsonResponse;
 import com.punchsettle.server.common.exception.BusinessException;
 import com.punchsettle.server.common.exception.LoginException;
+import com.punchsettle.server.common.pojo.JsonResponse;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/punchsettle/server/core/aop/ResponseControllerAdvice.java

@@ -12,7 +12,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.punchsettle.server.common.annotation.IgnoreResponseWrapper;
-import com.punchsettle.server.common.dto.JsonResponse;
+import com.punchsettle.server.common.pojo.JsonResponse;
 
 /**
  * 接口返回统一处理

src/main/java/com/punchsettle/server/core/interceptor/MybatisAuditDataInterceptor.java

@@ -13,7 +13,7 @@ import org.apache.ibatis.plugin.Intercepts;
 import org.apache.ibatis.plugin.Invocation;
 import org.apache.ibatis.plugin.Signature;
 
-import com.punchsettle.server.common.entity.BaseEntity;
+import com.punchsettle.server.common.pojo.BaseEntity;
 import com.punchsettle.server.utiis.UserUtils;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/punchsettle/server/dto/punchin/RemakePunchInDto.java

@@ -1,27 +0,0 @@
-package com.punchsettle.server.dto.punchin;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-/**
- * @author tyuio
- * @version 1.0.0
- * @description 补打卡dto
- * @date 2024/12/14 14:40
- */
-@Data
-public class RemakePunchInDto {
-
-    /**
-     * 打卡任务ID
-     */
-    @NotNull(message = "打卡任务ID不能为空")
-    private Long id;
-
-    /**
-     * 打卡日期
-     */
-    @NotBlank(message = "补打卡日期不能为空")
-    private String punchInDate;
-}

src/main/java/com/punchsettle/server/dto/reward/ClaimRewardRecordQuery.java

@@ -1,28 +0,0 @@
-package com.punchsettle.server.dto.reward;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author tyuio
- * @version 1.0.0
- * @description 领取奖励记录查询
- * @date 2024/11/25 20:44
- */
-@Data
-@EqualsAndHashCode
-public class ClaimRewardRecordQuery {
-
-    /*
-     * 查询时间范围 开始
-     */
-    @NotBlank(message = "开始时间不能为空")
-    private String startDate;
-
-    /*
-     * 查询时间范围 结束
-     */
-    @NotBlank(message = "结束时间不能为空")
-    private String endDate;
-}

src/main/java/com/punchsettle/server/dto/settle/SettleQuery.java

@@ -1,27 +0,0 @@
-package com.punchsettle.server.dto.settle;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author tyuio
- * @version 1.0.0
- * @description 结算查询dto
- * @date 2024/12/15 15:36
- */
-@Data
-@EqualsAndHashCode
-public class SettleQuery {
-
-    @NotBlank(message = "开始时间不能为空")
-    private String startDate;
-
-    @NotBlank(message = "结束时间不能为空")
-    private String endDate;
-
-    /**
-     * 用户主键
-     */
-    private Long userId;
-}

src/main/java/com/punchsettle/server/dto/task/SettleRewardTaskDto.java

@@ -1,27 +0,0 @@
-package com.punchsettle.server.dto.task;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author tyuio
- * @version 1.0.0
- * @description 结算奖励dto
- * @date 2024/12/12 22:26
- */
-@Data
-@EqualsAndHashCode
-public class SettleRewardTaskDto {
-
-    /**
-     * 需要结算的用户id
-     */
-    private Long userId;
-
-    /**
-     * 需要结算的打卡日期
-     */
-    @NotBlank(message = "结算日期不能为空")
-    private String settleDate;
-}

src/main/java/com/punchsettle/server/feign/WechatMiniProgramFeign.java

@@ -4,8 +4,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import com.punchsettle.server.dto.wechat.Code2SessionRequest;
-import com.punchsettle.server.dto.wechat.Code2SessionResponse;
+import com.punchsettle.server.feign.dto.Code2SessionRequest;
+import com.punchsettle.server.feign.dto.Code2SessionResponse;
 
 /**
  * @interfaceNName WeChatMiniProgramFeign

src/main/java/com/punchsettle/server/dto/wechat/Code2SessionRequest.java → src/main/java/com/punchsettle/server/feign/dto/Code2SessionRequest.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.wechat;
+package com.punchsettle.server.feign.dto;
 
 import feign.Param;
 import lombok.Data;

src/main/java/com/punchsettle/server/dto/wechat/Code2SessionResponse.java → src/main/java/com/punchsettle/server/feign/dto/Code2SessionResponse.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.wechat;
+package com.punchsettle.server.feign.dto;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 

src/main/java/com/punchsettle/server/dto/wechat/LoginRequest.java → src/main/java/com/punchsettle/server/pojo/login/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.wechat;
+package com.punchsettle.server.pojo.login;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

src/main/java/com/punchsettle/server/dto/punchin/PunchInCalendarDataResult.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInCalendarDataVO.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import java.time.LocalTime;
 
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class PunchInCalendarDataResult {
+public class PunchInCalendarDataVO {
 
     /**
      * 打卡日期

src/main/java/com/punchsettle/server/dto/punchin/PunchInDataQuery.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInDataQuery.java

@@ -1,6 +1,5 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/punchsettle/server/dto/punchin/PunchInDataResult.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInDataVO.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class PunchInDataResult {
+public class PunchInDataVO {
 
     /**
      * 打卡任务开始显示日期
@@ -39,10 +39,10 @@ public class PunchInDataResult {
     /**
      * 打卡记录（日历）
      */
-    private List<PunchInCalendarDataResult> calendarSelected;
+    private List<PunchInCalendarDataVO> calendarSelected;
 
     /**
      * 打卡记录
      */
-    private List<PunchInRecordDataResult> punchInRecords;
+    private List<PunchInRecordDataVO> punchInRecords;
 }

src/main/java/com/punchsettle/server/dto/punchin/PunchInQuery.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInQuery.java

@@ -1,10 +1,10 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
+
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/dto/punchin/PunchInRecordDataResult.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInRecordDataVO.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import java.time.LocalTime;
 
@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class PunchInRecordDataResult {
+public class PunchInRecordDataVO {
 
     /**
      * 打卡日期

src/main/java/com/punchsettle/server/dto/punchin/PunchInRecordQuery.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInRecordQuery.java

@@ -1,7 +1,9 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import java.util.List;
 
+import com.punchsettle.server.common.pojo.BaseQuery;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,24 +14,14 @@ import lombok.EqualsAndHashCode;
  * @date 2024/11/25 16:09
  */
 @Data
-@EqualsAndHashCode
-public class PunchInRecordQuery {
+@EqualsAndHashCode(callSuper = true)
+public class PunchInRecordQuery extends BaseQuery {
 
     /**
      * 打卡任务主键
      */
     private List<Long> punchInIds;
 
-    /**
-     * 打卡日期范围-开始日期
-     */
-    private String startDate;
-
-    /**
-     * 打卡日期范围-结束日期
-     */
-    private String endDate;
-
     /**
      * 打卡日期
      */

src/main/java/com/punchsettle/server/pojo/punchin/PunchInRecordRequest.java

@@ -0,0 +1,39 @@
+package com.punchsettle.server.pojo.punchin;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author tyuio
+ * @version 1.0.0
+ * @description 打卡记录
+ * @date 2024/11/25 16:24
+ */
+@Data
+@EqualsAndHashCode
+public class PunchInRecordRequest {
+
+    /**
+     * 补打卡校验组
+     */
+    public interface Remake {};
+
+    /**
+     * 撤销打卡校验组
+     */
+    public interface Revoke {};
+
+    /**
+     * 打卡任务ID
+     */
+    @NotNull(message = "打卡任务ID不能为空", groups = {Revoke.class, Remake.class})
+    private Long punchInId;
+
+    /**
+     * 打卡日期
+     */
+    @NotBlank(message = "补打卡日期不能为空", groups = {Remake.class})
+    private String punchInDate;
+}

src/main/java/com/punchsettle/server/dto/punchin/PunchInRecordDto.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInRecordVO.java

@@ -1,8 +1,7 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import com.punchsettle.server.constant.PunchInStatusViewEnum;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,18 +13,16 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class PunchInRecordDto {
+public class PunchInRecordVO {
 
     /**
      * 打卡任务ID
      */
-    @NotNull(message = "打卡任务ID不能为空")
     private Long punchInId;
 
     /**
      * 打卡日期
      */
-    @NotBlank(message = "补打卡日期不能为空")
     private String punchInDate;
 
     /**

src/main/java/com/punchsettle/server/dto/punchin/PunchInDto.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInRequest.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import java.time.LocalTime;
 
@@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class PunchInDto {
+public class PunchInRequest {
 
     /**
      * 打卡校验组
@@ -40,7 +40,7 @@ public class PunchInDto {
     /**
      * 打卡结算主键
      */
-    @NotNull(message = "打卡结算主键不能为空", groups = {Query.class, Update.class, Delete.class, DoPunchIn.class, Archive.class})
+    @NotNull(message = "打卡任务主键不能为空", groups = {Query.class, Update.class, Delete.class, DoPunchIn.class, Archive.class})
     private Long id;
 
     /**

src/main/java/com/punchsettle/server/pojo/punchin/PunchInVO.java

@@ -0,0 +1,70 @@
+package com.punchsettle.server.pojo.punchin;
+
+import java.time.LocalTime;
+
+import com.punchsettle.server.constant.PunchInCategoryEnum;
+import com.punchsettle.server.constant.PunchInRuleEnum;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author tyuio
+ * @version 1.0.0
+ * @description 打卡结算任务信息 vo
+ * @date 2024/11/25 15:01
+ */
+@Data
+@EqualsAndHashCode
+public class PunchInVO {
+
+    /**
+     * 打卡结算主键
+     */
+    private Long id;
+
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
+    /**
+     * 奖励倍数
+     */
+    private Integer rewardNum;
+
+    /**
+     * 打卡类型(0-单次打卡，1-计数、2计时)
+     */
+    private PunchInCategoryEnum category;
+
+    /**
+     * @see PunchInRuleEnum
+     */
+    private PunchInRuleEnum rule;
+
+    /**
+     * 次数记录
+     */
+    private Integer countTrack;
+
+    /**
+     * 时间记录
+     */
+    private LocalTime timeTrack;
+
+    /**
+     * 任务描述
+     */
+    private String description;
+
+    /**
+     * 是否启用周末双倍标志(0-不是，1-是)
+     */
+    private Boolean weekendDoubleFlag;
+
+    /**
+     * 是否启用全勤奖励标志(0-不是，1-是)
+     */
+    private Boolean fullAttendanceFlag;
+}

src/main/java/com/punchsettle/server/dto/punchin/PunchInWithRecordDto.java → src/main/java/com/punchsettle/server/pojo/punchin/PunchInWithRecordVO.java

@@ -1,20 +1,21 @@
-package com.punchsettle.server.dto.punchin;
+package com.punchsettle.server.pojo.punchin;
 
 import java.time.LocalTime;
 import java.util.List;
 
 import com.punchsettle.server.constant.PunchInCategoryEnum;
 import com.punchsettle.server.constant.PunchInStatusViewEnum;
+
 import lombok.Data;
 
 /**
  * @author tyuio
  * @version 1.0.0
- * @description 打卡任务并带有打卡记录信息 dto
+ * @description 打卡任务并带有打卡记录信息 vo
  * @date 2024/11/25 15:41
  */
 @Data
-public class PunchInWithRecordDto {
+public class PunchInWithRecordVO {
 
     /**
      * 打卡任务主键
@@ -69,7 +70,7 @@ public class PunchInWithRecordDto {
     /**
      * 打卡记录
      */
-    private List<PunchInRecordDto> punchInRecords;
+    private List<PunchInRecordVO> punchInRecords;
 
     /**
      * 打卡状态（今天）

src/main/java/com/punchsettle/server/pojo/reward/ClaimRewardRecordQuery.java

@@ -0,0 +1,18 @@
+package com.punchsettle.server.pojo.reward;
+
+import com.punchsettle.server.common.pojo.BaseQuery;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author tyuio
+ * @version 1.0.0
+ * @description 领取奖励记录查询
+ * @date 2024/11/25 20:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClaimRewardRecordQuery extends BaseQuery {
+
+}

src/main/java/com/punchsettle/server/dto/reward/ClaimRewardRecordDto.java → src/main/java/com/punchsettle/server/pojo/reward/ClaimRewardRecordVO.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.reward;
+package com.punchsettle.server.pojo.reward;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class ClaimRewardRecordDto {
+public class ClaimRewardRecordVO {
 
     /**
      * 记录主键

src/main/java/com/punchsettle/server/dto/reward/ClaimRewardDto.java → src/main/java/com/punchsettle/server/pojo/reward/ClaimRewardRequest.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.reward;
+package com.punchsettle.server.pojo.reward;
 
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class ClaimRewardDto {
+public class ClaimRewardRequest {
 
     /**
      * 领取奖励数

src/main/java/com/punchsettle/server/dto/scratch/ScratchQuery.java → src/main/java/com/punchsettle/server/pojo/scratch/ScratchQuery.java

@@ -1,7 +1,8 @@
-package com.punchsettle.server.dto.scratch;
+package com.punchsettle.server.pojo.scratch;
 
+import com.punchsettle.server.common.pojo.BaseQuery;
 import com.punchsettle.server.constant.ScratchActionTypeEnum;
-import jakarta.validation.constraints.NotBlank;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,8 +13,8 @@ import lombok.EqualsAndHashCode;
  * @date 2024/12/13 16:23
  */
 @Data
-@EqualsAndHashCode
-public class ScratchQuery {
+@EqualsAndHashCode(callSuper = true)
+public class ScratchQuery extends BaseQuery {
 
     /**
      * 动作类型(0-投入/购买，1-中奖，2-撤销投入，3-撤销中奖)
@@ -25,16 +26,4 @@ public class ScratchQuery {
      * 用户主键
      */
     private Long userId;
-
-    /*
-     * 查询时间范围 开始
-     */
-    @NotBlank(message = "开始时间不能为空")
-    private String startDate;
-
-    /*
-     * 查询时间范围 结束
-     */
-    @NotBlank(message = "结束时间不能为空")
-    private String endDate;
 }

src/main/java/com/punchsettle/server/dto/scratch/ScratchDto.java → src/main/java/com/punchsettle/server/pojo/scratch/ScratchRequest.java

@@ -1,23 +1,24 @@
-package com.punchsettle.server.dto.scratch;
+package com.punchsettle.server.pojo.scratch;
+
+import java.math.BigDecimal;
 
 import com.punchsettle.server.common.valid.Save;
 import com.punchsettle.server.constant.ScratchActionTypeEnum;
+
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * @author tyuio
  * @version 1.0.0
- * @description 刮刮乐 dto
+ * @description 刮刮乐 request
  * @date 2024/12/13 15:47
  */
 @Data
 @EqualsAndHashCode
-public class ScratchDto {
+public class ScratchRequest {
 
     /**
      * 撤销校验组
@@ -54,9 +55,4 @@ public class ScratchDto {
     @NotNull(message = "金额不能为空", groups = {Save.class})
     @Positive(message = "金额必须大于0", groups = {Save.class})
     private BigDecimal amount;
-
-    /**
-     * 创建时间
-     */
-    private String creationTime;
 }

src/main/java/com/punchsettle/server/pojo/scratch/ScratchVO.java

@@ -0,0 +1,49 @@
+package com.punchsettle.server.pojo.scratch;
+
+import java.math.BigDecimal;
+
+import com.punchsettle.server.constant.ScratchActionTypeEnum;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author tyuio
+ * @version 1.0.0
+ * @description 刮刮乐 dto
+ * @date 2024/12/13 15:47
+ */
+@Data
+@EqualsAndHashCode
+public class ScratchVO {
+
+    /**
+     * 刮刮乐记录ID
+     */
+    private Long id;
+
+    /**
+     * 动作类型(0-投入/购买，1-中奖，2-撤销投入，3-撤销中奖)
+     */
+    private ScratchActionTypeEnum actionType;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 种类
+     */
+    private String category;
+
+    /**
+     * 金额（元）
+     */
+    private BigDecimal amount;
+
+    /**
+     * 创建时间
+     */
+    private String creationTime;
+}

src/main/java/com/punchsettle/server/dto/settle/SettleInfoDto.java → src/main/java/com/punchsettle/server/pojo/settle/SettleInfoDto.java

@@ -1,12 +1,13 @@
-package com.punchsettle.server.dto.settle;
+package com.punchsettle.server.pojo.settle;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
 
 import com.punchsettle.server.constant.PunchInSettleTypeEnum;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-
 /**
  * @author tyuio
  * @version 1.0.0

src/main/java/com/punchsettle/server/pojo/settle/SettleQuery.java

@@ -0,0 +1,22 @@
+package com.punchsettle.server.pojo.settle;
+
+import com.punchsettle.server.common.pojo.BaseQuery;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author tyuio
+ * @version 1.0.0
+ * @description 结算查询dto
+ * @date 2024/12/15 15:36
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SettleQuery extends BaseQuery {
+
+    /**
+     * 用户主键
+     */
+    private Long userId;
+}

src/main/java/com/punchsettle/server/dto/settle/SettleRequest.java → src/main/java/com/punchsettle/server/pojo/settle/SettleRequest.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.settle;
+package com.punchsettle.server.pojo.settle;
 
 import java.util.List;
 

src/main/java/com/punchsettle/server/dto/settle/SettleResultDto.java → src/main/java/com/punchsettle/server/pojo/settle/SettleResultDto.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto.settle;
+package com.punchsettle.server.pojo.settle;
 
 import java.util.List;
 

src/main/java/com/punchsettle/server/dto/settle/SettleDto.java → src/main/java/com/punchsettle/server/pojo/settle/SettleVO.java

@@ -1,6 +1,4 @@
-package com.punchsettle.server.dto.settle;
-
-import java.sql.Timestamp;
+package com.punchsettle.server.pojo.settle;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +11,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode
-public class SettleDto {
+public class SettleVO {
 
     /**
      * 主键

src/main/java/com/punchsettle/server/dto/user/NicknameDto.java → src/main/java/com/punchsettle/server/pojo/user/NicknameRequest.java

@@ -1,9 +1,10 @@
-package com.punchsettle.server.dto.user;
+package com.punchsettle.server.pojo.user;
+
+import org.hibernate.validator.constraints.Length;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @author tyuio
@@ -13,7 +14,7 @@ import org.hibernate.validator.constraints.Length;
  */
 @Data
 @EqualsAndHashCode
-public class NicknameDto {
+public class NicknameRequest {
 
     /**
      * 昵称

src/main/java/com/punchsettle/server/dto/UserInfoDto.java → src/main/java/com/punchsettle/server/pojo/user/UserInfoVO.java

@@ -1,4 +1,4 @@
-package com.punchsettle.server.dto;
+package com.punchsettle.server.pojo.user;
 
 import java.math.BigDecimal;
 
@@ -8,12 +8,12 @@ import lombok.EqualsAndHashCode;
 /**
  * @author tyuio
  * @version 1.0.0
- * @description 用户信息 dto
+ * @description 用户信息 VO
  * @date 2024/11/25 19:42
  */
 @Data
 @EqualsAndHashCode
-public class UserInfoDto {
+public class UserInfoVO {
 
     /**
      * 微信昵称

src/main/java/com/punchsettle/server/service/controller/HealthController.java

@@ -1,12 +1,12 @@
 package com.punchsettle.server.service.controller;
 
-import com.punchsettle.server.atomic.entity.PunchIn;
-import com.punchsettle.server.atomic.mapper.PunchInMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.punchsettle.server.atomic.mapper.PunchInMapper;
+
 /**
  * 健康检查
  * 
@@ -27,22 +27,4 @@ public class HealthController {
     public String info() {
         return "打卡结算后端服务 正在运行";
     }
-
-    @GetMapping("/test")
-    public String test() {
-        // 新增
-        // 查询
-        // 删除
-        // 修改
-        PunchIn punchIn = new PunchIn();
-        punchIn.setTaskName("任务名");
-        punchIn.setArchiveFlag(true);
-        punchIn.setRewardNum(12);
-        punchIn.setFullAttendanceFlag(true);
-        punchIn.setWeekendDoubleFlag(false);
-        punchIn.setVersion(1);
-//        punchInMapper.insert(punchIn);
-        punchInMapper.updateByPrimaryKey(punchIn);
-        return "测试";
-    }
 }

src/main/java/com/punchsettle/server/service/controller/LoginController.java

@@ -4,10 +4,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.punchsettle.server.dto.wechat.LoginRequest;
+import com.punchsettle.server.pojo.login.LoginRequest;
 import com.punchsettle.server.service.manager.ILoginManager;
 
 /**
@@ -27,7 +26,7 @@ public class LoginController {
      * 微信小程序登录
      * 
      * @param request
-     * @return 微信登陆后获得的session_key
+     * @return 访问凭据
      */
     @PostMapping("/wechat/miniprogram/login")
     public String wechatMiniProgramLogin(@RequestBody @Validated LoginRequest request) {

src/main/java/com/punchsettle/server/service/controller/PunchInController.java

@@ -1,13 +1,7 @@
 package com.punchsettle.server.service.controller;
 
-import java.time.LocalDate;
-import java.time.YearMonth;
 import java.util.List;
 
-import com.punchsettle.server.common.valid.Query;
-import com.punchsettle.server.dto.punchin.PunchInDataQuery;
-import com.punchsettle.server.dto.punchin.PunchInDataResult;
-import com.punchsettle.server.dto.punchin.PunchInRecordDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,10 +11,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.punchsettle.server.common.valid.Delete;
+import com.punchsettle.server.common.valid.Query;
 import com.punchsettle.server.common.valid.Save;
 import com.punchsettle.server.common.valid.Update;
-import com.punchsettle.server.dto.punchin.PunchInDto;
-import com.punchsettle.server.dto.punchin.PunchInWithRecordDto;
+import com.punchsettle.server.pojo.punchin.PunchInDataQuery;
+import com.punchsettle.server.pojo.punchin.PunchInDataVO;
+import com.punchsettle.server.pojo.punchin.PunchInRecordRequest;
+import com.punchsettle.server.pojo.punchin.PunchInRequest;
+import com.punchsettle.server.pojo.punchin.PunchInVO;
+import com.punchsettle.server.pojo.punchin.PunchInWithRecordVO;
 import com.punchsettle.server.service.manager.IPunchInManager;
 
 /**
@@ -40,76 +39,76 @@ public class PunchInController {
      * 查询打卡任务
      */
     @GetMapping("/queryPunchIns")
-    public List<PunchInWithRecordDto> queryPunchIns() {
+    public List<PunchInWithRecordVO> queryPunchIns() {
         return punchInManager.queryPunchInAndRecord();
     }
 
     /**
      * 查询指定打卡任务
-     * @param dto
+     * @param request
      * @return
      */
     @PostMapping("queryPunchInById")
-    public PunchInDto queryPunchInById(@RequestBody @Validated({Query.class}) PunchInDto dto) {
-        return punchInManager.queryPunchInById(dto.getId());
+    public PunchInVO queryPunchInById(@RequestBody @Validated({Query.class}) PunchInRequest request) {
+        return punchInManager.queryPunchInById(request.getId());
     }
 
     /**
      * 新增打卡任务
      */
     @PostMapping("/savePunchIn")
-    public void save(@RequestBody @Validated({Save.class}) PunchInDto dto) {
-        punchInManager.saveOrUpdatePunchIn(dto);
+    public void save(@RequestBody @Validated({Save.class}) PunchInRequest request) {
+        punchInManager.saveOrUpdatePunchIn(request);
     }
 
     /**
      * 更新打卡任务
      */
     @PostMapping("/updatePunchIn")
-    public void update(@RequestBody @Validated({Update.class}) PunchInDto dto) {
-        punchInManager.saveOrUpdatePunchIn(dto);
+    public void update(@RequestBody @Validated({Update.class}) PunchInRequest request) {
+        punchInManager.saveOrUpdatePunchIn(request);
     }
 
     /**
      * 删除打卡任务
      */
     @PostMapping("/deletePunchIn")
-    public void delete(@RequestBody @Validated({Delete.class}) PunchInDto dto) {
-        punchInManager.deletePunchIn(dto.getId());
+    public void delete(@RequestBody @Validated({Delete.class}) PunchInRequest request) {
+        punchInManager.deletePunchIn(request.getId());
     }
 
     /**
      * 打卡
      */
     @PostMapping("/doPunchIn")
-    public void doPunchIn(@RequestBody @Validated({PunchInDto.DoPunchIn.class}) PunchInDto dto) {
-        punchInManager.doPunchIn(dto);
+    public void doPunchIn(@RequestBody @Validated({PunchInRequest.DoPunchIn.class}) PunchInRequest request) {
+        punchInManager.doPunchIn(request);
     }
 
     /**
      * 归档
-     * @param dto
+     * @param request
      */
     @PostMapping("/archivePunchIn")
-    public void archivePunchIn(@RequestBody @Validated({PunchInDto.Archive.class}) PunchInDto dto) {
-        punchInManager.archivePunchIn(dto.getId());
+    public void archivePunchIn(@RequestBody @Validated({PunchInRequest.Archive.class}) PunchInRequest request) {
+        punchInManager.archivePunchIn(request.getId());
     }
 
     /**
      * 补打卡
      */
     @PostMapping("/remakePunchIn")
-    public void remakePunchIn(@RequestBody @Validated PunchInRecordDto dto) {
-        punchInManager.remakePunchIn(dto);
+    public void remakePunchIn(@RequestBody @Validated({PunchInRecordRequest.Remake.class}) PunchInRecordRequest request) {
+        punchInManager.remakePunchIn(request);
     }
 
     /**
      * 撤销误打卡
-     * @param dto
+     * @param request
      */
     @PostMapping("/revokePunchIn")
-    public void revokePunchIn(@RequestBody @Validated PunchInDto dto) {
-        punchInManager.revokePunchIn(dto);
+    public void revokePunchIn(@RequestBody @Validated({PunchInRecordRequest.Revoke.class}) PunchInRecordRequest request) {
+        punchInManager.revokePunchIn(request);
     }
 
     /**
@@ -117,7 +116,7 @@ public class PunchInController {
      * @param query
      */
     @PostMapping("/queryPunchInData")
-    public PunchInDataResult queryPunchInData(@RequestBody @Validated PunchInDataQuery query) {
+    public PunchInDataVO queryPunchInData(@RequestBody @Validated PunchInDataQuery query) {
         return punchInManager.queryPunchInData(query);
     }
 }

src/main/java/com/punchsettle/server/service/controller/RewardController.java

@@ -1,20 +1,19 @@
 package com.punchsettle.server.service.controller;
 
-import com.punchsettle.server.dto.reward.ClaimRewardRecordDto;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordQuery;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.punchsettle.server.dto.reward.ClaimRewardDto;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordQuery;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordVO;
+import com.punchsettle.server.pojo.reward.ClaimRewardRequest;
 import com.punchsettle.server.service.manager.IRewardManager;
 
-import java.util.List;
-
 /**
  * @author tyuio
  * @version 1.0.0
@@ -33,16 +32,16 @@ public class RewardController {
      * @return
      */
     @PostMapping("/queryClaimRewardRecords")
-    public List<ClaimRewardRecordDto> queryClaimRewardRecords(@RequestBody @Validated ClaimRewardRecordQuery query) {
+    public List<ClaimRewardRecordVO> queryClaimRewardRecords(@RequestBody @Validated ClaimRewardRecordQuery query) {
         return rewardManager.queryClaimRewardRecords(query);
     }
 
     /**
      * 领取奖励
-     * @param dto
+     * @param request
      */
     @PostMapping("/claimReward")
-    public void claimReward(@RequestBody @Validated ClaimRewardDto dto) {
-        rewardManager.claimReward(dto);
+    public void claimReward(@RequestBody @Validated ClaimRewardRequest request) {
+        rewardManager.claimReward(request);
     }
 }

src/main/java/com/punchsettle/server/service/controller/ScratchController.java

@@ -1,9 +1,7 @@
 package com.punchsettle.server.service.controller;
 
-import com.punchsettle.server.common.valid.Save;
-import com.punchsettle.server.dto.scratch.ScratchDto;
-import com.punchsettle.server.dto.scratch.ScratchQuery;
-import com.punchsettle.server.service.manager.IScratchManager;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,7 +9,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import com.punchsettle.server.common.valid.Save;
+import com.punchsettle.server.pojo.scratch.ScratchQuery;
+import com.punchsettle.server.pojo.scratch.ScratchRequest;
+import com.punchsettle.server.pojo.scratch.ScratchVO;
+import com.punchsettle.server.service.manager.IScratchManager;
 
 /**
  * @author tyuio
@@ -28,26 +30,26 @@ public class ScratchController {
 
     /**
      * 增加投入金额/中奖金额记录
-     * @param dto
+     * @param request
      */
     @PostMapping("/addScratchRecord")
-    public void addScratchRecord(@RequestBody @Validated({Save.class}) ScratchDto dto) {
-        scratchManager.addScratchRecord(dto);
+    public void addScratchRecord(@RequestBody @Validated({Save.class}) ScratchRequest request) {
+        scratchManager.addScratchRecord(request);
     }
 
     /**
      * 撤销投入金额记录/中奖记录
      */
     @PostMapping("/revokeScratchRecord")
-    public void revokeScratchRecord(@RequestBody @Validated({ScratchDto.Revoke.class})ScratchDto dto) {
-        scratchManager.revokeScratchRecord(dto);
+    public void revokeScratchRecord(@RequestBody @Validated({ScratchRequest.Revoke.class}) ScratchRequest request) {
+        scratchManager.revokeScratchRecord(request);
     }
 
     /**
      * 按时间范围查询刮刮乐记录
      */
     @PostMapping("/queryScratchRecord")
-    public List<ScratchDto> queryScratchRecord(@RequestBody @Validated ScratchQuery query) {
+    public List<ScratchVO> queryScratchRecord(@RequestBody @Validated ScratchQuery query) {
         return scratchManager.queryScratchRecord(query);
     }
 }

src/main/java/com/punchsettle/server/service/controller/SettleController.java

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.punchsettle.server.dto.settle.SettleDto;
-import com.punchsettle.server.dto.settle.SettleQuery;
-import com.punchsettle.server.dto.settle.SettleRequest;
+import com.punchsettle.server.pojo.settle.SettleQuery;
+import com.punchsettle.server.pojo.settle.SettleRequest;
+import com.punchsettle.server.pojo.settle.SettleVO;
 import com.punchsettle.server.service.manager.ISettleManager;
 
 /**
@@ -39,7 +39,7 @@ public class SettleController {
      * 手动调起结算定时任务
      */
     @PostMapping("/querySettle")
-    public List<SettleDto> querySettle(@RequestBody @Validated SettleQuery query) {
+    public List<SettleVO> querySettle(@RequestBody @Validated SettleQuery query) {
         return settleManager.querySettle(query);
     }
 }

src/main/java/com/punchsettle/server/service/controller/UserController.java

@@ -1,8 +1,5 @@
 package com.punchsettle.server.service.controller;
 
-import com.punchsettle.server.dto.UserInfoDto;
-import com.punchsettle.server.dto.user.NicknameDto;
-import com.punchsettle.server.service.manager.IUserManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,6 +8,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.punchsettle.server.pojo.user.NicknameRequest;
+import com.punchsettle.server.pojo.user.UserInfoVO;
+import com.punchsettle.server.service.manager.IUserManager;
+
 /**
  * @author tyuio
  * @version 1.0.0
@@ -29,7 +30,7 @@ public class UserController {
      * @return
      */
     @GetMapping("/queryUserInfo")
-    public UserInfoDto queryUserInfo() {
+    public UserInfoVO queryUserInfo() {
         return userManager.queryUserInfo();
     }
 
@@ -37,7 +38,7 @@ public class UserController {
      * 修改昵称
      */
     @PostMapping("/modifyNickname")
-    public void modifyNickname(@RequestBody @Validated NicknameDto dto) {
-        userManager.modifyNickname(dto);
+    public void modifyNickname(@RequestBody @Validated NicknameRequest request) {
+        userManager.modifyNickname(request);
     }
 }

src/main/java/com/punchsettle/server/service/manager/ILoginManager.java

@@ -1,6 +1,6 @@
 package com.punchsettle.server.service.manager;
 
-import com.punchsettle.server.dto.wechat.LoginRequest;
+import com.punchsettle.server.pojo.login.LoginRequest;
 
 /**
  * 登录 服务类

src/main/java/com/punchsettle/server/service/manager/IPunchInManager.java

@@ -2,11 +2,12 @@ package com.punchsettle.server.service.manager;
 
 import java.util.List;
 
-import com.punchsettle.server.dto.punchin.PunchInDataQuery;
-import com.punchsettle.server.dto.punchin.PunchInDataResult;
-import com.punchsettle.server.dto.punchin.PunchInDto;
-import com.punchsettle.server.dto.punchin.PunchInRecordDto;
-import com.punchsettle.server.dto.punchin.PunchInWithRecordDto;
+import com.punchsettle.server.pojo.punchin.PunchInDataQuery;
+import com.punchsettle.server.pojo.punchin.PunchInDataVO;
+import com.punchsettle.server.pojo.punchin.PunchInRecordRequest;
+import com.punchsettle.server.pojo.punchin.PunchInRequest;
+import com.punchsettle.server.pojo.punchin.PunchInVO;
+import com.punchsettle.server.pojo.punchin.PunchInWithRecordVO;
 
 /**
  * @author tyuio
@@ -20,18 +21,18 @@ public interface IPunchInManager {
      * 查询打卡任务及其打卡记录
      * @return
      */
-    List<PunchInWithRecordDto> queryPunchInAndRecord();
+    List<PunchInWithRecordVO> queryPunchInAndRecord();
 
     /**
      * 根据ID获取打卡任务
      */
-    PunchInDto queryPunchInById(Long punchInId);
+    PunchInVO queryPunchInById(Long punchInId);
 
     /**
      * 新增或更新打卡结算任务
-     * @param dto 打卡结算
+     * @param request 打卡结算
      */
-    void saveOrUpdatePunchIn(PunchInDto dto);
+    void saveOrUpdatePunchIn(PunchInRequest request);
 
     /**
      * 根据主键删除打卡结算任务
@@ -41,9 +42,9 @@ public interface IPunchInManager {
 
     /**
      * 完成打卡结算任务插入打卡记录
-     * @param punchInDto
+     * @param request
      */
-    void doPunchIn(PunchInDto punchInDto);
+    void doPunchIn(PunchInRequest request);
 
     /**
      * 归档打卡任务
@@ -53,20 +54,20 @@ public interface IPunchInManager {
 
     /**
      * 补打卡
-     * @param dto
+     * @param request
      */
-    void remakePunchIn(PunchInRecordDto dto);
+    void remakePunchIn(PunchInRecordRequest request);
 
     /**
      * 撤销误打卡
-     * @param dto
+     * @param request
      */
-    void revokePunchIn(PunchInDto dto);
+    void revokePunchIn(PunchInRecordRequest request);
 
     /**
      * 查询打卡数据
      * @param query
      * @return
      */
-    PunchInDataResult queryPunchInData(PunchInDataQuery query);
+    PunchInDataVO queryPunchInData(PunchInDataQuery query);
 }

src/main/java/com/punchsettle/server/service/manager/IRewardManager.java

@@ -1,11 +1,11 @@
 package com.punchsettle.server.service.manager;
 
-import com.punchsettle.server.dto.reward.ClaimRewardDto;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordDto;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordQuery;
-
 import java.util.List;
 
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordQuery;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordVO;
+import com.punchsettle.server.pojo.reward.ClaimRewardRequest;
+
 /**
  * @author tyuio
  * @version 1.0.0
@@ -16,13 +16,13 @@ public interface IRewardManager {
 
     /**
      * 领取奖励
-     * @param dto
+     * @param request
      */
-    void claimReward(ClaimRewardDto dto);
+    void claimReward(ClaimRewardRequest request);
 
     /**
      * 查询当前用户拥有的奖励数
      * @return
      */
-    List<ClaimRewardRecordDto> queryClaimRewardRecords(ClaimRewardRecordQuery query);
+    List<ClaimRewardRecordVO> queryClaimRewardRecords(ClaimRewardRecordQuery query);
 }

src/main/java/com/punchsettle/server/service/manager/IScratchManager.java

@@ -1,10 +1,11 @@
 package com.punchsettle.server.service.manager;
 
-import com.punchsettle.server.dto.scratch.ScratchDto;
-import com.punchsettle.server.dto.scratch.ScratchQuery;
-
 import java.util.List;
 
+import com.punchsettle.server.pojo.scratch.ScratchQuery;
+import com.punchsettle.server.pojo.scratch.ScratchRequest;
+import com.punchsettle.server.pojo.scratch.ScratchVO;
+
 /**
  * @author tyuio
  * @version 1.0.0
@@ -15,17 +16,17 @@ public interface IScratchManager {
 
     /**
      * 加投入金额/中奖金额记录
-     * @param dto
+     * @param request
      */
-    void addScratchRecord(ScratchDto dto);
+    void addScratchRecord(ScratchRequest request);
 
     /**
      * 撤销投入金额记录/中奖记录
      */
-    void revokeScratchRecord(ScratchDto dto);
+    void revokeScratchRecord(ScratchRequest request);
 
     /**
      * 按时间范围查询刮刮乐记录
      */
-    List<ScratchDto> queryScratchRecord(ScratchQuery query);
+    List<ScratchVO> queryScratchRecord(ScratchQuery query);
 }

src/main/java/com/punchsettle/server/service/manager/ISettleManager.java

@@ -7,9 +7,9 @@ import com.punchsettle.server.atomic.entity.PunchIn;
 import com.punchsettle.server.atomic.entity.PunchInRecord;
 import com.punchsettle.server.constant.PunchInSettleTypeEnum;
 import com.punchsettle.server.constant.PunchInStatusEnum;
-import com.punchsettle.server.dto.settle.SettleDto;
-import com.punchsettle.server.dto.settle.SettleQuery;
-import com.punchsettle.server.dto.settle.SettleRequest;
+import com.punchsettle.server.pojo.settle.SettleQuery;
+import com.punchsettle.server.pojo.settle.SettleRequest;
+import com.punchsettle.server.pojo.settle.SettleVO;
 
 /**
  * @author tyuio
@@ -47,5 +47,5 @@ public interface ISettleManager {
      * @param query
      * @return
      */
-    List<SettleDto> querySettle(SettleQuery query);
+    List<SettleVO> querySettle(SettleQuery query);
 }

src/main/java/com/punchsettle/server/service/manager/IUserManager.java

@@ -1,8 +1,8 @@
 package com.punchsettle.server.service.manager;
 
 import com.punchsettle.server.atomic.entity.User;
-import com.punchsettle.server.dto.UserInfoDto;
-import com.punchsettle.server.dto.user.NicknameDto;
+import com.punchsettle.server.pojo.user.NicknameRequest;
+import com.punchsettle.server.pojo.user.UserInfoVO;
 
 /**
  * @author tyuio
@@ -22,10 +22,10 @@ public interface IUserManager {
      * 查询当前用户信息
      * @return
      */
-    UserInfoDto queryUserInfo();
+    UserInfoVO queryUserInfo();
 
     /**
      * 修改昵称
      */
-    void modifyNickname(NicknameDto dto);
+    void modifyNickname(NicknameRequest request);
 }

src/main/java/com/punchsettle/server/service/manager/impl/LoginManagerImpl.java

@@ -10,10 +10,10 @@ import com.punchsettle.server.atomic.entity.User;
 import com.punchsettle.server.common.exception.BusinessException;
 import com.punchsettle.server.constant.CacheConstant;
 import com.punchsettle.server.core.config.BizConfig;
-import com.punchsettle.server.dto.wechat.Code2SessionRequest;
-import com.punchsettle.server.dto.wechat.Code2SessionResponse;
-import com.punchsettle.server.dto.wechat.LoginRequest;
 import com.punchsettle.server.feign.WechatMiniProgramFeign;
+import com.punchsettle.server.feign.dto.Code2SessionRequest;
+import com.punchsettle.server.feign.dto.Code2SessionResponse;
+import com.punchsettle.server.pojo.login.LoginRequest;
 import com.punchsettle.server.service.manager.ILoginManager;
 import com.punchsettle.server.service.manager.IUserManager;
 import com.punchsettle.server.utiis.CacheUtils;

src/main/java/com/punchsettle/server/service/manager/impl/PunchInManagerImpl.java

@@ -16,11 +16,6 @@ import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.punchsettle.server.constant.PunchInStatusEnum;
-import com.punchsettle.server.dto.punchin.PunchInDataQuery;
-import com.punchsettle.server.dto.punchin.PunchInDataResult;
-import com.punchsettle.server.dto.punchin.PunchInCalendarDataResult;
-import com.punchsettle.server.dto.punchin.PunchInRecordDataResult;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,12 +30,19 @@ import com.punchsettle.server.common.exception.BusinessException;
 import com.punchsettle.server.common.utils.Assert;
 import com.punchsettle.server.constant.PunchInCategoryEnum;
 import com.punchsettle.server.constant.PunchInSettleTypeEnum;
+import com.punchsettle.server.constant.PunchInStatusEnum;
 import com.punchsettle.server.constant.PunchInStatusViewEnum;
-import com.punchsettle.server.dto.punchin.PunchInDto;
-import com.punchsettle.server.dto.punchin.PunchInQuery;
-import com.punchsettle.server.dto.punchin.PunchInRecordDto;
-import com.punchsettle.server.dto.punchin.PunchInRecordQuery;
-import com.punchsettle.server.dto.punchin.PunchInWithRecordDto;
+import com.punchsettle.server.pojo.punchin.PunchInCalendarDataVO;
+import com.punchsettle.server.pojo.punchin.PunchInDataQuery;
+import com.punchsettle.server.pojo.punchin.PunchInDataVO;
+import com.punchsettle.server.pojo.punchin.PunchInQuery;
+import com.punchsettle.server.pojo.punchin.PunchInRecordDataVO;
+import com.punchsettle.server.pojo.punchin.PunchInRecordQuery;
+import com.punchsettle.server.pojo.punchin.PunchInRecordRequest;
+import com.punchsettle.server.pojo.punchin.PunchInRecordVO;
+import com.punchsettle.server.pojo.punchin.PunchInRequest;
+import com.punchsettle.server.pojo.punchin.PunchInVO;
+import com.punchsettle.server.pojo.punchin.PunchInWithRecordVO;
 import com.punchsettle.server.service.manager.IPunchInManager;
 import com.punchsettle.server.service.manager.ISettleManager;
 import com.punchsettle.server.utiis.DateUtils;
@@ -73,7 +75,7 @@ public class PunchInManagerImpl implements IPunchInManager {
     private static final BigDecimal ONE_HUNDRED = new BigDecimal(100);
 
     @Override
-    public List<PunchInWithRecordDto> queryPunchInAndRecord() {
+    public List<PunchInWithRecordVO> queryPunchInAndRecord() {
         // 获取当前用户ID
         Long currentUserId = Optional.ofNullable(UserUtils.getCurrentUserId())
             .orElseThrow(() -> BusinessException.fail("无法获取当前用户信息，无法查询打卡任务"));
@@ -93,43 +95,43 @@ public class PunchInManagerImpl implements IPunchInManager {
         // 获取打卡任务ID
         List<Long> punchInIds = punchIns.stream().map(PunchIn::getId).collect(Collectors.toList());
         // 找出范围内的打卡记录
-        PunchInRecordQuery query = new PunchInRecordQuery();
-        query.setPunchInIds(punchInIds);
-        query.setStartDate(weeklyDateRange.getFirst().toString());
-        query.setEndDate(weeklyDateRange.getLast().toString());
-        List<PunchInRecord> punchInRecords = punchInRecordService.listByCondition(query);
+        PunchInRecordQuery punchInRecordQuery = new PunchInRecordQuery();
+        punchInRecordQuery.setPunchInIds(punchInIds);
+        punchInRecordQuery.setStartDate(weeklyDateRange.getFirst().toString());
+        punchInRecordQuery.setEndDate(weeklyDateRange.getLast().toString());
+        List<PunchInRecord> punchInRecords = punchInRecordService.listByCondition(punchInRecordQuery);
 
         // 打卡任务-打卡记录 分组
         Map<Long, List<PunchInRecord>> recordMap =
             punchInRecords.stream().collect(Collectors.groupingBy(PunchInRecord::getPunchInId));
 
         // 日期格式化
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf = DateUtils.buildDateFormat();
 
         // 当前日期
         LocalDate today = LocalDate.now();
 
         // 构建打卡记录
-        List<PunchInWithRecordDto> punchInWithRecordDtos = new ArrayList<>();
+        List<PunchInWithRecordVO> punchInWithRecordVOS = new ArrayList<>();
         for (PunchIn punchIn : punchIns) {
             // 一周的打卡记录容器
-            List<PunchInRecordDto> weeklyRecords = new ArrayList<>();
+            List<PunchInRecordVO> weeklyRecords = new ArrayList<>();
             // 打卡任务信息
-            PunchInWithRecordDto punchInWithRecordDto = new PunchInWithRecordDto();
-            BeanUtils.copyProperties(punchIn, punchInWithRecordDto);
-            punchInWithRecordDto.setPunchInId(punchIn.getId());
+            PunchInWithRecordVO punchInWithRecordVO = new PunchInWithRecordVO();
+            BeanUtils.copyProperties(punchIn, punchInWithRecordVO);
+            punchInWithRecordVO.setPunchInId(punchIn.getId());
             // 设置一个默认的页面显示值
-            punchInWithRecordDto.setTimeTrack(LocalTime.parse("00:00:00.000"));
-            punchInWithRecordDto.setCountTrack(0);
-            punchInWithRecordDto.setPunchInRecords(weeklyRecords);
-            punchInWithRecordDtos.add(punchInWithRecordDto);
+            punchInWithRecordVO.setTimeTrack(LocalTime.parse("00:00:00.000"));
+            punchInWithRecordVO.setCountTrack(0);
+            punchInWithRecordVO.setPunchInRecords(weeklyRecords);
+            punchInWithRecordVOS.add(punchInWithRecordVO);
 
             // 打卡任务创建日期
             LocalDate punchInCreationDate = LocalDate.parse(sdf.format(punchIn.getCreationTime()));
 
             // 获取打卡任务对应的打卡记录，并转为打卡日期-打卡记录map
             List<PunchInRecord> records =
-                Optional.ofNullable(recordMap.get(punchInWithRecordDto.getPunchInId())).orElse(List.of());
+                Optional.ofNullable(recordMap.get(punchInWithRecordVO.getPunchInId())).orElse(List.of());
             Map<String, PunchInRecord> weeklyRecordMap = records.stream()
                 .collect(Collectors.toMap(PunchInRecord::getPunchInDate, Function.identity(), (key1, key2) -> key1));
 
@@ -143,25 +145,25 @@ public class PunchInManagerImpl implements IPunchInManager {
                 PunchInStatusViewEnum punchInStatus = judgePunchInStatus(today, weeklyDate, punchInCreationDate, punchIn, punchInRecord);
 
                 // 设置打卡记录
-                PunchInRecordDto punchInRecordDto = new PunchInRecordDto();
-                punchInRecordDto.setPunchInDate(weeklyDateStr);
-                punchInRecordDto.setPunchInStatus(punchInStatus);
-                weeklyRecords.add(punchInRecordDto);
+                PunchInRecordVO punchInRecordVO = new PunchInRecordVO();
+                punchInRecordVO.setPunchInDate(weeklyDateStr);
+                punchInRecordVO.setPunchInStatus(punchInStatus);
+                weeklyRecords.add(punchInRecordVO);
 
                 // 如果是今天的打卡记录，设置计数/计时属性
                 if (!Objects.isNull(punchInRecord) && today.isEqual(weeklyDate)) {
-                    punchInWithRecordDto.setTimeTrack(punchInRecord.getTimeTrack());
-                    punchInWithRecordDto.setCountTrack(punchInRecord.getCountTrack());
+                    punchInWithRecordVO.setTimeTrack(punchInRecord.getTimeTrack());
+                    punchInWithRecordVO.setCountTrack(punchInRecord.getCountTrack());
                 }
 
                 // 如果是今天设置状态控制页面显示
                 if (today.isEqual(weeklyDate)) {
-                    punchInWithRecordDto.setPunchInStatus(punchInStatus);
+                    punchInWithRecordVO.setPunchInStatus(punchInStatus);
                 }
             }
         }
 
-        return punchInWithRecordDtos;
+        return punchInWithRecordVOS;
     }
 
     private PunchInStatusViewEnum judgePunchInStatus(LocalDate today, LocalDate weeklyDate, LocalDate punchInCreationDate, PunchIn punchIn, PunchInRecord punchInRecord) {
@@ -204,31 +206,31 @@ public class PunchInManagerImpl implements IPunchInManager {
     }
 
     @Override
-    public PunchInDto queryPunchInById(Long punchInId) {
+    public PunchInVO queryPunchInById(Long punchInId) {
         Assert.isNullInBusiness(punchInId, "请传入待查询的任务ID");
         return Optional.ofNullable(punchInService.getById(punchInId)).map(punchIn -> {
-            PunchInDto dto = new PunchInDto();
-            BeanUtils.copyProperties(punchIn, dto);
-            return dto;
+            PunchInVO punchInVO = new PunchInVO();
+            BeanUtils.copyProperties(punchIn, punchInVO);
+            return punchInVO;
         }).orElseThrow(() -> BusinessException.fail("无法查询到该打卡任务"));
     }
 
     @Override
-    public void saveOrUpdatePunchIn(PunchInDto dto) {
-        Assert.isNullInBusiness(dto, "请传入任务信息");
+    public void saveOrUpdatePunchIn(PunchInRequest request) {
+        Assert.isNullInBusiness(request, "请传入任务信息");
 
-        if (PunchInCategoryEnum.COUNT.equals(dto.getCategory())
-                && (Objects.isNull(dto.getRule()) || Objects.isNull(dto.getCountTrack()))) {
+        if (PunchInCategoryEnum.COUNT.equals(request.getCategory())
+                && (Objects.isNull(request.getRule()) || Objects.isNull(request.getCountTrack()))) {
             throw BusinessException.fail("打卡类型：计数，比较规则和次数不能为空");
         }
 
-        if (PunchInCategoryEnum.TIME.equals(dto.getCategory())
-                && (Objects.isNull(dto.getRule()) || Objects.isNull(dto.getTimeTrack()))) {
+        if (PunchInCategoryEnum.TIME.equals(request.getCategory())
+                && (Objects.isNull(request.getRule()) || Objects.isNull(request.getTimeTrack()))) {
             throw BusinessException.fail("打卡类型：计时，比较规则和时间不能为空");
         }
 
         PunchIn punchIn = new PunchIn();
-        BeanUtils.copyProperties(dto, punchIn);
+        BeanUtils.copyProperties(request, punchIn);
         punchIn.setArchiveFlag(false);
 
         if (Objects.isNull(punchIn.getId())) {
@@ -246,14 +248,14 @@ public class PunchInManagerImpl implements IPunchInManager {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void doPunchIn(PunchInDto punchInDto) {
-        if (Objects.isNull(punchInDto) || Objects.isNull(punchInDto.getId())) {
+    public void doPunchIn(PunchInRequest request) {
+        if (Objects.isNull(request) || Objects.isNull(request.getId())) {
             BusinessException.throwFail("请传入待打卡的任务");
         }
 
-        PunchIn punchIn = Optional.ofNullable(punchInService.getById(punchInDto.getId()))
+        PunchIn punchIn = Optional.ofNullable(punchInService.getById(request.getId()))
                 .orElseThrow(() -> BusinessException.fail("无法查询到该打卡任务"));
-        if (PunchInCategoryEnum.TIME.equals(punchIn.getCategory()) && Objects.isNull(punchInDto.getTimeTrack())) {
+        if (PunchInCategoryEnum.TIME.equals(punchIn.getCategory()) && Objects.isNull(request.getTimeTrack())) {
             BusinessException.throwFail("打卡类型：计时，请传入时间记录");
         }
 
@@ -261,7 +263,7 @@ public class PunchInManagerImpl implements IPunchInManager {
         LocalDate today = LocalDate.now();
         PunchInRecordQuery punchInRecordQuery = new PunchInRecordQuery();
         punchInRecordQuery.setPunchInDate(today.toString());
-        punchInRecordQuery.setPunchInId(punchInDto.getId());
+        punchInRecordQuery.setPunchInId(request.getId());
         PunchInRecord oldPunchInRecord = punchInRecordService.selectOneByCondition(punchInRecordQuery);
 
         // 打卡类型：单次打卡，需要判断是否重复打卡
@@ -272,7 +274,7 @@ public class PunchInManagerImpl implements IPunchInManager {
         // 获取或创建打卡记录
         PunchInRecord punchInRecord = Optional.ofNullable(oldPunchInRecord).orElseGet(() -> {
             PunchInRecord record = new PunchInRecord();
-            record.setPunchInId(punchInDto.getId());
+            record.setPunchInId(request.getId());
             record.setPunchInDate(LocalDate.now().toString());
             return record;
         });
@@ -284,7 +286,7 @@ public class PunchInManagerImpl implements IPunchInManager {
 
         // 打卡类型：计时，需要记录最新打卡时长
         if (PunchInCategoryEnum.TIME.equals(punchIn.getCategory())) {
-            punchInRecord.setTimeTrack(punchInDto.getTimeTrack());
+            punchInRecord.setTimeTrack(request.getTimeTrack());
         }
 
         // 新增或更新
@@ -306,9 +308,9 @@ public class PunchInManagerImpl implements IPunchInManager {
     }
 
     @Override
-    public void remakePunchIn(PunchInRecordDto dto) {
+    public void remakePunchIn(PunchInRecordRequest request) {
         // 待补卡的打卡日期
-        LocalDate punchInDate = LocalDate.parse(dto.getPunchInDate());
+        LocalDate punchInDate = LocalDate.parse(request.getPunchInDate());
 
         // 如果补打卡日期是今天，则不允许补卡
         if (punchInDate.isEqual(LocalDate.now())) {
@@ -316,22 +318,22 @@ public class PunchInManagerImpl implements IPunchInManager {
         }
 
         // 获取打卡任务
-        PunchIn punchIn = Optional.ofNullable(punchInService.getById(dto.getPunchInId())).orElseThrow(() -> BusinessException.fail("无法查询到该打卡任务"));
+        PunchIn punchIn = Optional.ofNullable(punchInService.getById(request.getPunchInId())).orElseThrow(() -> BusinessException.fail("无法查询到该打卡任务"));
         // 补打卡的打卡日期不能早于打卡任务创建日期
         if (punchInDate.isBefore(punchIn.getCreationTime().toLocalDateTime().toLocalDate())) {
             BusinessException.throwFail("补打卡日期不能早于打卡任务创建日期");
         }
 
-        settleManager.settleHandler(PunchInSettleTypeEnum.REMAKE, punchInDate, Arrays.asList(UserUtils.getCurrentUserId()), Arrays.asList(dto.getPunchInId()));
+        settleManager.settleHandler(PunchInSettleTypeEnum.REMAKE, punchInDate, Arrays.asList(UserUtils.getCurrentUserId()), Arrays.asList(request.getPunchInId()));
     }
 
     @Override
-    public void revokePunchIn(PunchInDto dto) {
+    public void revokePunchIn(PunchInRecordRequest request) {
         // 获取打卡任务
-        PunchIn punchIn = Optional.ofNullable(punchInService.getById(dto.getId())).orElseThrow(() -> BusinessException.fail("无法查询到该打卡任务"));
+        PunchIn punchIn = Optional.ofNullable(punchInService.getById(request.getPunchInId())).orElseThrow(() -> BusinessException.fail("无法查询到该打卡任务"));
 
         PunchInRecordQuery punchInRecordQuery = new PunchInRecordQuery();
-        punchInRecordQuery.setPunchInId(dto.getId());
+        punchInRecordQuery.setPunchInId(request.getPunchInId());
         punchInRecordQuery.setPunchInDate(LocalDate.now().toString());
         PunchInRecord punchInRecord = punchInRecordService.selectOneByCondition(punchInRecordQuery);
         if (Objects.isNull(punchInRecord)) {
@@ -357,10 +359,10 @@ public class PunchInManagerImpl implements IPunchInManager {
     }
 
     @Override
-    public PunchInDataResult queryPunchInData(PunchInDataQuery query) {
+    public PunchInDataVO queryPunchInData(PunchInDataQuery query) {
         PunchIn punchIn = Optional.ofNullable(punchInService.getById(query.getId())).orElseThrow(() -> BusinessException.fail("找到指定的打卡任务"));
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf = DateUtils.buildDateFormat();
         YearMonth yearMonth = YearMonth.of(query.getYear(), query.getMonth());
         // 本月第一日
         LocalDate firstOfMonth = yearMonth.atDay(1);
@@ -377,22 +379,22 @@ public class PunchInManagerImpl implements IPunchInManager {
         List<PunchInRecord> punchInRecords = punchInRecordService.listByCondition(punchInRecordQuery);
 
         // 构造数据，日历部分的数据只需要已打卡的数据
-        List<PunchInCalendarDataResult> punchInCalendarDataResults = new ArrayList<>();
-        List<PunchInRecordDataResult> punchInRecordDtoList = new ArrayList<>();
+        List<PunchInCalendarDataVO> punchInCalendarDataVOS = new ArrayList<>();
+        List<PunchInRecordDataVO> punchInRecordDtoList = new ArrayList<>();
         for (PunchInRecord punchInRecord : punchInRecords) {
-            PunchInRecordDataResult punchInRecordDto = new PunchInRecordDataResult();
-            BeanUtils.copyProperties(punchInRecord, punchInRecordDto);
-            punchInRecordDtoList.add(punchInRecordDto);
+            PunchInRecordDataVO punchInRecordDataVO = new PunchInRecordDataVO();
+            BeanUtils.copyProperties(punchInRecord, punchInRecordDataVO);
+            punchInRecordDtoList.add(punchInRecordDataVO);
 
             if (PunchInStatusEnum.UN_FINISH.equals(punchInRecord.getPunchInStatus())
                     || PunchInStatusEnum.DOING.equals(punchInRecord.getPunchInStatus())) {
                 continue;
             }
-            PunchInCalendarDataResult punchInCalendarDataResult = new PunchInCalendarDataResult();
-            punchInCalendarDataResult.setPunchInDate(punchInRecord.getPunchInDate());
-            punchInCalendarDataResult.setInfo("打卡");
-            punchInCalendarDataResult.setDate(punchInRecord.getPunchInDate());
-            punchInCalendarDataResults.add(punchInCalendarDataResult);
+            PunchInCalendarDataVO punchInCalendarDataVO = new PunchInCalendarDataVO();
+            punchInCalendarDataVO.setPunchInDate(punchInRecord.getPunchInDate());
+            punchInCalendarDataVO.setInfo("打卡");
+            punchInCalendarDataVO.setDate(punchInRecord.getPunchInDate());
+            punchInCalendarDataVOS.add(punchInCalendarDataVO);
         }
 
         // 计算全勤率
@@ -400,20 +402,20 @@ public class PunchInManagerImpl implements IPunchInManager {
         // 要考虑任务刚创建的情况，任务较迟创建的话则使用任务创建时间
         long dayLength = ChronoUnit.DAYS.between(firstOfMonth.isBefore(punchInCreationDate) ? punchInCreationDate : firstOfMonth, LocalDate.now());
         if (dayLength != 0) {
-            punchInRate = BigDecimal.valueOf(punchInCalendarDataResults.size())
+            punchInRate = BigDecimal.valueOf(punchInCalendarDataVOS.size())
                     .divide(BigDecimal.valueOf(dayLength), 4, RoundingMode.HALF_DOWN)
                     .multiply(ONE_HUNDRED);
         }
 
         // 构造返回结果
-        PunchInDataResult punchInDataResult = new PunchInDataResult();
-        punchInDataResult.setStartDate(sdf.format(punchIn.getCreationTime()));
-        punchInDataResult.setEndDate(LocalDate.now().toString());
-        punchInDataResult.setPunchInNum(punchInCalendarDataResults.size());
-        punchInDataResult.setCalendarSelected(punchInCalendarDataResults);
-        punchInDataResult.setPunchInRecords(punchInRecordDtoList);
-        punchInDataResult.setPunchInRate(punchInRate);
-
-        return punchInDataResult;
+        PunchInDataVO punchInDataVO = new PunchInDataVO();
+        punchInDataVO.setStartDate(sdf.format(punchIn.getCreationTime()));
+        punchInDataVO.setEndDate(LocalDate.now().toString());
+        punchInDataVO.setPunchInNum(punchInCalendarDataVOS.size());
+        punchInDataVO.setCalendarSelected(punchInCalendarDataVOS);
+        punchInDataVO.setPunchInRecords(punchInRecordDtoList);
+        punchInDataVO.setPunchInRate(punchInRate);
+
+        return punchInDataVO;
     }
 }

src/main/java/com/punchsettle/server/service/manager/impl/RewardManagerImpl.java

@@ -3,26 +3,24 @@ package com.punchsettle.server.service.manager.impl;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
-import com.punchsettle.server.atomic.entity.User;
-import com.punchsettle.server.atomic.service.IUserService;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordDto;
-import com.punchsettle.server.dto.reward.ClaimRewardRecordQuery;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.punchsettle.server.atomic.entity.User;
 import com.punchsettle.server.atomic.entity.UserClaimRewardRecord;
 import com.punchsettle.server.atomic.service.IUserClaimRewardRecordService;
+import com.punchsettle.server.atomic.service.IUserService;
 import com.punchsettle.server.common.exception.BusinessException;
-import com.punchsettle.server.common.utils.Assert;
-import com.punchsettle.server.dto.reward.ClaimRewardDto;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordQuery;
+import com.punchsettle.server.pojo.reward.ClaimRewardRecordVO;
+import com.punchsettle.server.pojo.reward.ClaimRewardRequest;
 import com.punchsettle.server.service.manager.IRewardManager;
+import com.punchsettle.server.utiis.DateUtils;
 import com.punchsettle.server.utiis.UserUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * @author tyuio
@@ -41,26 +39,22 @@ public class RewardManagerImpl implements IRewardManager {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void claimReward(ClaimRewardDto dto) {
-        if (Objects.isNull(dto) || Objects.isNull(dto.getClaimRewardNum())) {
-            throw BusinessException.fail("待领取的奖励数不能为空");
-        }
-
+    public void claimReward(ClaimRewardRequest request) {
         // 获取用户信息
         Long currentUserId =
             Optional.ofNullable(UserUtils.getCurrentUserId()).orElseThrow(() -> BusinessException.fail("无法获取当前用户ID"));
         User user = Optional.ofNullable(userService.getById(currentUserId)).orElseThrow(() -> BusinessException.fail("无法获取当前用户的奖励信息"));
 
         // 计算未领取奖励数、已领取奖励数
-        if (user.getUnclaimedRewardNum() < dto.getClaimRewardNum()) {
+        if (user.getUnclaimedRewardNum() < request.getClaimRewardNum()) {
             throw BusinessException.fail("当前用户奖励不足，无法领取");
         }
-        int unclaimedRewardNum = user.getUnclaimedRewardNum() - dto.getClaimRewardNum();
-        int claimedRewardNum = user.getClaimedRewardNum() + dto.getClaimRewardNum();
+        int unclaimedRewardNum = user.getUnclaimedRewardNum() - request.getClaimRewardNum();
+        int claimedRewardNum = user.getClaimedRewardNum() + request.getClaimRewardNum();
 
         // 构建打卡记录
         UserClaimRewardRecord userClaimRewardRecord = new UserClaimRewardRecord();
-        userClaimRewardRecord.setClaimRewardNum(dto.getClaimRewardNum());
+        userClaimRewardRecord.setClaimRewardNum(request.getClaimRewardNum());
         userClaimRewardRecord.setClaimRewardTime(new Timestamp(System.currentTimeMillis()));
         userClaimRewardRecord.setBeforeClaimRewardNum(user.getUnclaimedRewardNum());
         userClaimRewardRecord.setAfterClaimRewardNum(unclaimedRewardNum);
@@ -75,22 +69,15 @@ public class RewardManagerImpl implements IRewardManager {
     }
 
     @Override
-    public List<ClaimRewardRecordDto> queryClaimRewardRecords(ClaimRewardRecordQuery query) {
-        if (Objects.isNull(query) || !StringUtils.hasText(query.getStartDate()) || !StringUtils.hasText(query.getEndDate())) {
-            BusinessException.throwFail("请选择待查询的领奖记录时间范围");
-        }
-
-        query.setStartDate(String.format("%s 00:00:00.000", query.getStartDate()));
-        query.setEndDate(String.format("%s 23:59:59.999", query.getEndDate()));
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public List<ClaimRewardRecordVO> queryClaimRewardRecords(ClaimRewardRecordQuery query) {
+        SimpleDateFormat sdf = DateUtils.buildDateTimeFormat();
 
         List<UserClaimRewardRecord> userClaimRewardRecords = userClaimRewardRecordService.listByCondition(query);
         return userClaimRewardRecords.stream().map(record -> {
-            ClaimRewardRecordDto dto = new ClaimRewardRecordDto();
-            BeanUtils.copyProperties(record, dto);
-            dto.setClaimRewardTime(sdf.format(record.getClaimRewardTime()));
-            return dto;
+            ClaimRewardRecordVO claimRewardRecordVO = new ClaimRewardRecordVO();
+            BeanUtils.copyProperties(record, claimRewardRecordVO);
+            claimRewardRecordVO.setClaimRewardTime(sdf.format(record.getClaimRewardTime()));
+            return claimRewardRecordVO;
         }).toList();
     }
 }

src/main/java/com/punchsettle/server/service/manager/impl/ScratchManagerImpl.java

@@ -1,31 +1,32 @@
 package com.punchsettle.server.service.manager.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
 import com.punchsettle.server.atomic.entity.LotteryScratchRecord;
 import com.punchsettle.server.atomic.entity.User;
 import com.punchsettle.server.atomic.service.ILotteryScratchRecordService;
 import com.punchsettle.server.atomic.service.IUserService;
 import com.punchsettle.server.common.exception.BusinessException;
 import com.punchsettle.server.constant.ScratchActionTypeEnum;
-import com.punchsettle.server.dto.scratch.ScratchDto;
-import com.punchsettle.server.dto.scratch.ScratchQuery;
+import com.punchsettle.server.pojo.scratch.ScratchQuery;
+import com.punchsettle.server.pojo.scratch.ScratchRequest;
+import com.punchsettle.server.pojo.scratch.ScratchVO;
 import com.punchsettle.server.service.manager.IScratchManager;
+import com.punchsettle.server.utiis.DateUtils;
 import com.punchsettle.server.utiis.UserUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 
 /**
  * @author tyuio
  * @version 1.0.0
- * @description TODO
+ * @description 刮刮乐 manager
  * @date 2024/12/13 16:25
  */
 @Service
@@ -39,8 +40,8 @@ public class ScratchManagerImpl implements IScratchManager {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addScratchRecord(ScratchDto dto) {
-        if (ScratchActionTypeEnum.REVOKE_WIN.equals(dto.getActionType()) || ScratchActionTypeEnum.REVOKE_INVEST.equals(dto.getActionType())) {
+    public void addScratchRecord(ScratchRequest request) {
+        if (ScratchActionTypeEnum.REVOKE_WIN.equals(request.getActionType()) || ScratchActionTypeEnum.REVOKE_INVEST.equals(request.getActionType())) {
             BusinessException.throwFail("传入了错误的记录动作类型");
         }
         Long currentUserId = UserUtils.getCurrentUserId();
@@ -48,24 +49,24 @@ public class ScratchManagerImpl implements IScratchManager {
 
         User updateUser = new User();
         updateUser.setId(user.getId());
-        if (ScratchActionTypeEnum.INVEST.equals(dto.getActionType())) {
-            updateUser.setLotteryInvestAmount(user.getLotteryInvestAmount().add(dto.getAmount()));
+        if (ScratchActionTypeEnum.INVEST.equals(request.getActionType())) {
+            updateUser.setLotteryInvestAmount(user.getLotteryInvestAmount().add(request.getAmount()));
         }
-        if (ScratchActionTypeEnum.WIN.equals(dto.getActionType())) {
-            updateUser.setLotteryWinAmount(user.getLotteryWinAmount().add(dto.getAmount()));
+        if (ScratchActionTypeEnum.WIN.equals(request.getActionType())) {
+            updateUser.setLotteryWinAmount(user.getLotteryWinAmount().add(request.getAmount()));
         }
         userService.updateById(updateUser);
 
         LotteryScratchRecord scratchRecord = new LotteryScratchRecord();
-        BeanUtils.copyProperties(dto, scratchRecord);
+        BeanUtils.copyProperties(request, scratchRecord);
         scratchRecord.setId(null);
         scratchRecordService.insert(scratchRecord);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void revokeScratchRecord(ScratchDto dto) {
-        if (ScratchActionTypeEnum.WIN.equals(dto.getActionType()) || ScratchActionTypeEnum.INVEST.equals(dto.getActionType())) {
+    public void revokeScratchRecord(ScratchRequest request) {
+        if (ScratchActionTypeEnum.WIN.equals(request.getActionType()) || ScratchActionTypeEnum.INVEST.equals(request.getActionType())) {
             BusinessException.throwFail("传入了错误的记录动作类型");
         }
 
@@ -74,7 +75,7 @@ public class ScratchManagerImpl implements IScratchManager {
         User user = Optional.ofNullable(userService.getById(currentUserId)).orElseThrow(() -> BusinessException.fail("无法获取当前用户信息"));
 
         // 获取待撤销的刮刮乐记录
-        LotteryScratchRecord scratchRecord = Optional.ofNullable(scratchRecordService.selectById(dto.getId())).orElseThrow(() -> BusinessException.fail("无法获取刮刮乐记录"));
+        LotteryScratchRecord scratchRecord = Optional.ofNullable(scratchRecordService.selectById(request.getId())).orElseThrow(() -> BusinessException.fail("无法获取刮刮乐记录"));
 
         // 待更新的用户信息
         User updateUser = new User();
@@ -107,13 +108,7 @@ public class ScratchManagerImpl implements IScratchManager {
     }
 
     @Override
-    public List<ScratchDto> queryScratchRecord(ScratchQuery query) {
-        if (Objects.isNull(query) || !StringUtils.hasText(query.getStartDate()) || !StringUtils.hasText(query.getEndDate())) {
-            BusinessException.throwFail("请选择待查询的时间范围");
-        }
-        query.setStartDate(String.format("%s 00:00:00.000", query.getStartDate()));
-        query.setEndDate(String.format("%s 23:59:59.999", query.getEndDate()));
-
+    public List<ScratchVO> queryScratchRecord(ScratchQuery query) {
         // 获取当前用户信息
         Long currentUserId = UserUtils.getCurrentUserId();
         User user = Optional.ofNullable(userService.getById(currentUserId)).orElseThrow(() -> BusinessException.fail("无法获取当前用户信息"));
@@ -124,13 +119,13 @@ public class ScratchManagerImpl implements IScratchManager {
             return List.of();
         }
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = DateUtils.buildDateTimeFormat();
 
         return scratchRecords.stream().map(record -> {
-            ScratchDto dto = new ScratchDto();
-            BeanUtils.copyProperties(record, dto);
-            dto.setCreationTime(sdf.format(record.getCreationTime()));
-            return dto;
+            ScratchVO scratchVO = new ScratchVO();
+            BeanUtils.copyProperties(record, scratchVO);
+            scratchVO.setCreationTime(sdf.format(record.getCreationTime()));
+            return scratchVO;
         }).toList();
     }
 

src/main/java/com/punchsettle/server/service/manager/impl/SettleManagerImpl.java

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import com.punchsettle.server.atomic.entity.PunchIn;
 import com.punchsettle.server.atomic.entity.PunchInRecord;
@@ -37,13 +36,13 @@ import com.punchsettle.server.constant.PunchInCategoryEnum;
 import com.punchsettle.server.constant.PunchInRuleEnum;
 import com.punchsettle.server.constant.PunchInSettleTypeEnum;
 import com.punchsettle.server.constant.PunchInStatusEnum;
-import com.punchsettle.server.dto.punchin.PunchInQuery;
-import com.punchsettle.server.dto.punchin.PunchInRecordQuery;
-import com.punchsettle.server.dto.settle.SettleDto;
-import com.punchsettle.server.dto.settle.SettleInfoDto;
-import com.punchsettle.server.dto.settle.SettleQuery;
-import com.punchsettle.server.dto.settle.SettleRequest;
-import com.punchsettle.server.dto.settle.SettleResultDto;
+import com.punchsettle.server.pojo.punchin.PunchInQuery;
+import com.punchsettle.server.pojo.punchin.PunchInRecordQuery;
+import com.punchsettle.server.pojo.settle.SettleInfoDto;
+import com.punchsettle.server.pojo.settle.SettleQuery;
+import com.punchsettle.server.pojo.settle.SettleRequest;
+import com.punchsettle.server.pojo.settle.SettleResultDto;
+import com.punchsettle.server.pojo.settle.SettleVO;
 import com.punchsettle.server.service.manager.ISettleManager;
 import com.punchsettle.server.utiis.DateUtils;
 import com.punchsettle.server.utiis.SpringUtils;
@@ -334,15 +333,9 @@ public class SettleManagerImpl implements ISettleManager {
         // 计数打卡
         if (PunchInCategoryEnum.COUNT.equals(punchIn.getCategory())) {
             Integer recordCountTrack = Optional.ofNullable(punchInRecord.getCountTrack()).orElse(0);
-            if (PunchInRuleEnum.GREATER.equals(punchIn.getRule()) && recordCountTrack.compareTo(punchIn.getCountTrack()) < 1) {
-                return PunchInStatusEnum.UN_FINISH;
-            }
             if (PunchInRuleEnum.GREATER_OR_EQUAL.equals(punchIn.getRule()) && recordCountTrack.compareTo(punchIn.getCountTrack()) == -1) {
                 return PunchInStatusEnum.UN_FINISH;
             }
-            if (PunchInRuleEnum.LESS.equals(punchIn.getRule()) && recordCountTrack.compareTo(punchIn.getCountTrack()) > -1) {
-                return PunchInStatusEnum.UN_FINISH;
-            }
             if (PunchInRuleEnum.LESS_OR_EQUAL.equals(punchIn.getRule()) && recordCountTrack.compareTo(punchIn.getCountTrack()) == 1) {
                 return PunchInStatusEnum.UN_FINISH;
             }
@@ -353,15 +346,9 @@ public class SettleManagerImpl implements ISettleManager {
         // 计时打卡
         if (PunchInCategoryEnum.TIME.equals(punchIn.getCategory())) {
             LocalTime recordTimeTrack = Optional.ofNullable(punchInRecord.getTimeTrack()).orElse(LocalTime.parse("00:00:00.000"));
-            if (PunchInRuleEnum.GREATER.equals(punchIn.getRule()) && recordTimeTrack.compareTo(punchIn.getTimeTrack()) < 1) {
-                return PunchInStatusEnum.UN_FINISH;
-            }
             if (PunchInRuleEnum.GREATER_OR_EQUAL.equals(punchIn.getRule()) && recordTimeTrack.compareTo(punchIn.getTimeTrack()) == -1) {
                 return PunchInStatusEnum.UN_FINISH;
             }
-            if (PunchInRuleEnum.LESS.equals(punchIn.getRule()) && recordTimeTrack.compareTo(punchIn.getTimeTrack()) > -1) {
-                return PunchInStatusEnum.UN_FINISH;
-            }
             if (PunchInRuleEnum.LESS_OR_EQUAL.equals(punchIn.getRule()) && recordTimeTrack.compareTo(punchIn.getTimeTrack()) == 1) {
                 return PunchInStatusEnum.UN_FINISH;
             }
@@ -380,20 +367,20 @@ public class SettleManagerImpl implements ISettleManager {
     private void fillTrack(PunchIn punchIn, PunchInRecord punchInRecord) {
         // 计数打卡
         if (PunchInCategoryEnum.COUNT.equals(punchIn.getCategory())) {
-            if (PunchInRuleEnum.GREATER.equals(punchIn.getRule())) {
+            if (PunchInRuleEnum.GREATER_OR_EQUAL.equals(punchIn.getRule())) {
                 punchInRecord.setCountTrack(punchIn.getCountTrack() + 1);
             }
-            if (PunchInRuleEnum.LESS.equals(punchIn.getRule())){
+            if (PunchInRuleEnum.LESS_OR_EQUAL.equals(punchIn.getRule())){
                 punchInRecord.setCountTrack(punchIn.getCountTrack() - 1);
             }
         }
 
         // 计时打卡
         if (PunchInCategoryEnum.TIME.equals(punchIn.getCategory())) {
-            if (PunchInRuleEnum.GREATER.equals(punchIn.getRule())) {
+            if (PunchInRuleEnum.GREATER_OR_EQUAL.equals(punchIn.getRule())) {
                 punchInRecord.setTimeTrack(punchIn.getTimeTrack().plusSeconds(1));
             }
-            if (PunchInRuleEnum.LESS.equals(punchIn.getRule())){
+            if (PunchInRuleEnum.LESS_OR_EQUAL.equals(punchIn.getRule())){
                 punchInRecord.setTimeTrack(punchIn.getTimeTrack().minusSeconds(1));
             }
         }
@@ -481,22 +468,15 @@ public class SettleManagerImpl implements ISettleManager {
     }
 
     @Override
-    public List<SettleDto> querySettle(SettleQuery query) {
-        if (Objects.isNull(query) || !StringUtils.hasText(query.getStartDate()) || !StringUtils.hasText(query.getEndDate())) {
-            BusinessException.throwFail("请选择待查询的结算记录时间范围");
-        }
-
-        query.setStartDate(String.format("%s 00:00:00.000", query.getStartDate()));
-        query.setEndDate(String.format("%s 23:59:59.999", query.getEndDate()));
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public List<SettleVO> querySettle(SettleQuery query) {
+        SimpleDateFormat sdf = DateUtils.buildDateTimeFormat();
 
         List<PunchInSettlement> punchInSettlements = punchInSettlementService.listByCondition(query);
         return punchInSettlements.stream().map(settlement -> {
-            SettleDto dto = new SettleDto();
-            BeanUtils.copyProperties(settlement, dto);
-            dto.setSettlementTime(sdf.format(settlement.getSettlementTime()));
-            return dto;
+            SettleVO settleVO = new SettleVO();
+            BeanUtils.copyProperties(settlement, settleVO);
+            settleVO.setSettlementTime(sdf.format(settlement.getSettlementTime()));
+            return settleVO;
         }).toList();
     }
 }

src/main/java/com/punchsettle/server/service/manager/impl/TaskManagerImpl.java

@@ -1,11 +1,10 @@
 package com.punchsettle.server.service.manager.impl;
 
-import com.punchsettle.server.constant.PunchInSettleTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import com.punchsettle.server.dto.task.SettleRewardTaskDto;
+import com.punchsettle.server.constant.PunchInSettleTypeEnum;
 import com.punchsettle.server.service.manager.ISettleManager;
 import com.punchsettle.server.service.manager.ITaskManager;
 import com.punchsettle.server.utiis.DateUtils;

src/main/java/com/punchsettle/server/service/manager/impl/UserManagerImpl.java

@@ -3,9 +3,6 @@ package com.punchsettle.server.service.manager.impl;
 import java.math.BigDecimal;
 import java.util.Objects;
 
-import com.punchsettle.server.dto.UserInfoDto;
-import com.punchsettle.server.dto.user.NicknameDto;
-import com.punchsettle.server.utiis.UserUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,7 +11,10 @@ import org.springframework.transaction.annotation.Transactional;
 import com.punchsettle.server.atomic.entity.User;
 import com.punchsettle.server.atomic.service.IUserService;
 import com.punchsettle.server.common.utils.Assert;
+import com.punchsettle.server.pojo.user.NicknameRequest;
+import com.punchsettle.server.pojo.user.UserInfoVO;
 import com.punchsettle.server.service.manager.IUserManager;
+import com.punchsettle.server.utiis.UserUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -60,19 +60,19 @@ public class UserManagerImpl implements IUserManager {
     }
 
     @Override
-    public UserInfoDto queryUserInfo() {
+    public UserInfoVO queryUserInfo() {
         Long currentUserId = UserUtils.getCurrentUserId();
         User user = userService.getById(currentUserId);
-        UserInfoDto userInfoDto = new UserInfoDto();
-        BeanUtils.copyProperties(user, userInfoDto);
-        return userInfoDto;
+        UserInfoVO userInfoVO = new UserInfoVO();
+        BeanUtils.copyProperties(user, userInfoVO);
+        return userInfoVO;
     }
 
     @Override
-    public void modifyNickname(NicknameDto dto) {
+    public void modifyNickname(NicknameRequest request) {
         User user = new User();
         user.setId(UserUtils.getCurrentUserId());
-        user.setNickname(dto.getNickname());
+        user.setNickname(request.getNickname());
         userService.updateById(user);
     }
 }

src/main/java/com/punchsettle/server/utiis/DateUtils.java

@@ -1,6 +1,5 @@
 package com.punchsettle.server.utiis;
 
-import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -16,6 +15,32 @@ import java.util.List;
  */
 public class DateUtils {
 
+    /**
+     * 完整的日期时间格式（yyyy-MM-dd HH:mm:ss）
+     */
+    public static final String ALL_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    /**
+     * 日期格式（yyyy-MM-dd）
+     */
+    public static final String DATE_FORMAT = "yyyy-MM-dd";
+
+    /**
+     * 创建完整的日期时间格式化器（yyyy-MM-dd HH:mm:ss）
+     * @return
+     */
+    public static SimpleDateFormat buildDateTimeFormat() {
+        return new SimpleDateFormat(ALL_DATE_TIME_FORMAT);
+    }
+
+    /**
+     * 创建日期格式化器（yyyy-MM-dd）
+     * @return
+     */
+    public static SimpleDateFormat buildDateFormat() {
+        return new SimpleDateFormat(DATE_FORMAT);
+    }
+
     /**
      * 获取一周的时间范围
      * @return 返回日期字符串列表