sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加预计还车时间

Browse Source
This commit is contained in:
zhangli
2025-08-04 00:12:58 +08:00
parent fe97877dfc
commit 73573560c0
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/sczx/order/common/enums/RentCarTypeEnum.java Normal file
View File

@ -0,0 +1,21 @@
package com.sczx.order.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Author: 张黎
* @Date: 2024/03/08/17:42
* @Description: 订单状态
*/
@AllArgsConstructor
@Getter
public enum RentCarTypeEnum {
DAILY_RENTAL("2", "日租"),
DAYS_RENTAL("3", "按天数租"),
RENT_INSTEAD_SELL("4", "以租代售"),
;
private final String code;
private final String msg;
}

12
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.sczx.order.common.constant.RedisKeyConstants;
import com.sczx.order.common.enums.MiniProgramTypeEnum;
import com.sczx.order.common.enums.OrderStatusEnum;
import com.sczx.order.common.enums.PaymentTypeEnum;
import com.sczx.order.common.enums.SubOrderTypeEnum;
import com.sczx.order.common.enums.*;
import com.sczx.order.convert.OrderConvert;
import com.sczx.order.convert.OrderSubConvert;
import com.sczx.order.dto.*;
@ -99,7 +96,12 @@ public class OrderServiceImpl implements OrderService {
//TODO 默认应该是待支付状态,这里先默认支付完成待取车
// orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PAY.getCode());
orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PICK.getCode());
orderMainPO.setFirstOrderTime(LocalDateTime.now());
if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAILY_RENTAL.getCode(), rentCarRuleDTO.getRentalType())){
orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(1));
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAYS_RENTAL.getCode(), rentCarRuleDTO.getRentalType())){
orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(rentCarRuleDTO.getRentalDays()));
}
//生成子表订单
String paymentType;