oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步 Date 转换 LocalDateTime 的修改~

Browse Source
This commit is contained in:
YunaiV
2022-11-11 00:20:57 +08:00
parent 2460e492cf
commit 19d9d66a38
336 changed files with 3536 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.order.biz.dataobject;
import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO;
import java.util.Date;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -71,23 +71,23 @@ public class OrderExchangeDO extends DeletableDO {
* 创建时间
* supper baseDO
*/
// private Date createTime;
// private LocalDateTime createTime;
/**
* 付款时间
*/
private Date paymentTime;
private LocalDateTime paymentTime;
/**
* 发货时间
*/
private Date deliveryTime;
private LocalDateTime deliveryTime;
/**
* 收货时间
*/
private Date receiverTime;
private LocalDateTime receiverTime;
/**
* 成交时间
*/
private Date closingTime;
private LocalDateTime closingTime;
///
/// 其他

4
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.order.biz.dataobject;
import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO;
import java.util.Date;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -28,7 +28,7 @@ public class OrderLogisticsDetailDO extends DeletableDO {
/**
* 物流时间
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 物流信息
*/

12
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.order.biz.dataobject;
import cn.iocoder.mall.mybatis.core.dataobject.BaseDO;
import java.util.Date;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -64,23 +64,23 @@ public class OrderReturnDO extends BaseDO {
/**
* 同意时间
*/
private Date approvalTime;
private LocalDateTime approvalTime;
/**
* 拒绝时间
*/
private Date refuseTime;
private LocalDateTime refuseTime;
/**
* 物流时间（填写物流单号时间）
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 收货时间
*/
private Date receiverTime;
private LocalDateTime receiverTime;
/**
* 成交时间（确认时间）
*/
private Date closingTime;
private LocalDateTime closingTime;
/**
* 服务类型
*

2
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/comment/OrderCommentReplyPageDTO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
*

10
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderQueryDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 订单 query
@@ -39,13 +39,13 @@ public class OrderQueryDTO implements Serializable {
/**
* 付款时间（待发货）
*/
private Date startPaymentTime;
private Date endPaymentTime;
private LocalDateTime startPaymentTime;
private LocalDateTime endPaymentTime;
/**
* 创建时间
*/
private Date startCreateTime;
private Date endCreateTime;
private LocalDateTime startCreateTime;
private LocalDateTime endCreateTime;
/**
* 删除状态
*/

2
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderReturnApplyDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author Sin

6
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderReturnQueryDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 订单退货 查询 po
@@ -32,11 +32,11 @@ public class OrderReturnQueryDTO implements Serializable {
/**
* 创建时间 - 开始
*/
private Date startCreateTime;
private LocalDateTime startCreateTime;
/**
* 创建时间 - 结束
*/
private Date endCreateTime;
private LocalDateTime endCreateTime;
/**
* 状态
*/

10
归档/moved/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderUserPageDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 用户订单 page
@@ -31,13 +31,13 @@ public class OrderUserPageDTO implements Serializable {
/**
* 付款时间（待发货）
*/
private Date startPaymentTime;
private Date endPaymentTime;
private LocalDateTime startPaymentTime;
private LocalDateTime endPaymentTime;
/**
* 创建时间
*/
private Date startCreateTime;
private Date endCreateTime;
private LocalDateTime startCreateTime;
private LocalDateTime endCreateTime;
/**
* 状态
*/

14
归档/moved/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderPageQueryRequest.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.mall.order.rest.request.admin;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -39,26 +39,26 @@ public class AdminsOrderPageQueryRequest implements Serializable {
*/
@ApiModelProperty("start付款时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startPaymentTime;
private LocalDateTime startPaymentTime;
@ApiModelProperty("end付款时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endPaymentTime;
private LocalDateTime endPaymentTime;
/**
* 创建时间
*/
@ApiModelProperty("start订单创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startCreateTime;
private LocalDateTime startCreateTime;
@ApiModelProperty("end订单创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
private LocalDateTime endCreateTime;
/**
* 结束时间
*/
@ApiModelProperty("start成交时间")
private Date startClosingTime;
private LocalDateTime startClosingTime;
@ApiModelProperty("end成交时间")
private Date endClosingTime;
private LocalDateTime endClosingTime;
/**
* 删除状态
*/

6
归档/moved/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/AdminsOrderReturnQueryRequest.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.order.rest.request.admin;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import javax.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -34,12 +34,12 @@ public class AdminsOrderReturnQueryRequest implements Serializable {
* 创建时间 - 开始
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startCreateTime;
private LocalDateTime startCreateTime;
/**
* 创建时间 - 结束
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
private LocalDateTime endCreateTime;
/**
* 状态
*/

4
归档/moved/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/response/comment/UsersOrderCommentPageResponse.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.order.rest.response.comment;
import io.swagger.annotations.ApiModel;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -78,7 +78,7 @@ public class UsersOrderCommentPageResponse {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
/**
* 商家回复列表 只展示最近的一条

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderCommentBO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
*
@@ -80,7 +80,7 @@ public class OrderCommentBO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
}

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderCommentInfoBO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
*
@@ -58,7 +58,7 @@ public class OrderCommentInfoBO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
/**
* 商品 sku id

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderCommentPageBO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
@@ -94,7 +94,7 @@ public class OrderCommentPageBO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
/**
* 商家回复列表

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderCommentReplyPageBO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -77,7 +77,7 @@ public class OrderCommentReplyPageBO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
}
}

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderCommentStateInfoPageBO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -80,7 +80,7 @@ public class OrderCommentStateInfoPageBO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
}

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderLastLogisticsInfoBO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -72,7 +72,7 @@ public class OrderLastLogisticsInfoBO implements Serializable {
/**
* 物流时间
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 物流时间 text
*/

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoBO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -69,7 +69,7 @@ public class OrderLogisticsInfoBO implements Serializable {
/**
* 物流时间
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 物流时间 text
*/

4
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoWithOrderBO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -87,7 +87,7 @@ public class OrderLogisticsInfoWithOrderBO implements Serializable {
/**
* 物流时间
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 物流时间 text
*/

10
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderReturnInfoBO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -103,19 +103,19 @@ public class OrderReturnInfoBO implements Serializable {
/**
* 同意时间
*/
private Date approvalTime;
private LocalDateTime approvalTime;
/**
* 物流时间（填写物流单号时间）
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 收货时间
*/
private Date receiverTime;
private LocalDateTime receiverTime;
/**
* 成交时间（确认时间）
*/
private Date closingTime;
private LocalDateTime closingTime;
/**
* 退款类型
*

14
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/bo/OrderReturnListBO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -82,19 +82,19 @@ public class OrderReturnListBO implements Serializable {
/**
* 同意时间
*/
private Date approvalTime;
private LocalDateTime approvalTime;
/**
* 物流时间（填写物流单号时间）
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 收货时间
*/
private Date receiverTime;
private LocalDateTime receiverTime;
/**
* 成交时间（确认时间）
*/
private Date closingTime;
private LocalDateTime closingTime;
/**
* 服务类型
*
@@ -115,10 +115,10 @@ public class OrderReturnListBO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
/**
* 更新时间
*/
private Date updateTime;
private LocalDateTime updateTime;
}
}

2
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/dto/OrderCommentReplyPageDTO.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
*

10
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 订单 query
@@ -39,13 +39,13 @@ public class OrderQueryDTO implements Serializable {
/**
* 付款时间（待发货）
*/
private Date startPaymentTime;
private Date endPaymentTime;
private LocalDateTime startPaymentTime;
private LocalDateTime endPaymentTime;
/**
* 创建时间
*/
private Date startCreateTime;
private Date endCreateTime;
private LocalDateTime startCreateTime;
private LocalDateTime endCreateTime;
/**
* 删除状态
*/

2
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnApplyDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author Sin

6
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnQueryDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 订单退货 查询 po
@@ -32,11 +32,11 @@ public class OrderReturnQueryDTO implements Serializable {
/**
* 创建时间 - 开始
*/
private Date startCreateTime;
private LocalDateTime startCreateTime;
/**
* 创建时间 - 结束
*/
private Date endCreateTime;
private LocalDateTime endCreateTime;
/**
* 状态
*/

10
归档/moved/order/order-service-api02/src/main/java/cn/iocoder/mall/order/api/dto/OrderUserPageDTO.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 用户订单 page
@@ -31,13 +31,13 @@ public class OrderUserPageDTO implements Serializable {
/**
* 付款时间（待发货）
*/
private Date startPaymentTime;
private Date endPaymentTime;
private LocalDateTime startPaymentTime;
private LocalDateTime endPaymentTime;
/**
* 创建时间
*/
private Date startCreateTime;
private Date endCreateTime;
private LocalDateTime startCreateTime;
private LocalDateTime endCreateTime;
/**
* 状态
*/

12
归档/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java
View File

@@ -4,7 +4,7 @@ import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 换货订单
@@ -72,23 +72,23 @@ public class OrderExchangeDO extends DeletableDO {
* 创建时间
* supper baseDO
*/
// private Date createTime;
// private LocalDateTime createTime;
/**
* 付款时间
*/
private Date paymentTime;
private LocalDateTime paymentTime;
/**
* 发货时间
*/
private Date deliveryTime;
private LocalDateTime deliveryTime;
/**
* 收货时间
*/
private Date receiverTime;
private LocalDateTime receiverTime;
/**
* 成交时间
*/
private Date closingTime;
private LocalDateTime closingTime;
///
/// 其他

4
归档/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java
View File

@@ -4,7 +4,7 @@ import cn.iocoder.common.framework.dataobject.DeletableDO;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 订单物流 - 详细信息
@@ -29,7 +29,7 @@ public class OrderLogisticsDetailDO extends DeletableDO {
/**
* 物流时间
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 物流信息
*/

12
归档/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java
View File

@@ -4,7 +4,7 @@ import cn.iocoder.common.framework.dataobject.BaseDO;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 退货订单
@@ -65,23 +65,23 @@ public class OrderReturnDO extends BaseDO {
/**
* 同意时间
*/
private Date approvalTime;
private LocalDateTime approvalTime;
/**
* 拒绝时间
*/
private Date refuseTime;
private LocalDateTime refuseTime;
/**
* 物流时间（填写物流单号时间）
*/
private Date logisticsTime;
private LocalDateTime logisticsTime;
/**
* 收货时间
*/
private Date receiverTime;
private LocalDateTime receiverTime;
/**
* 成交时间（确认时间）
*/
private Date closingTime;
private LocalDateTime closingTime;
/**
* 服务类型
*

2
归档/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentReplyServiceImpl.java
View File

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**

2
归档/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentServiceImpl.java
View File

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

2
归档/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java
View File

@@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;