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

订单dto，增加租电套餐信息

Browse Source
This commit is contained in:
zhangli
2025-07-30 01:41:35 +08:00
parent 2ec90aa3f4
commit e08db3be0e
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sczx/order/dto/OrderDTO.java
View File

@ -3,6 +3,7 @@ package com.sczx.order.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.sczx.order.thirdpart.dto.CarModelSimpleDTO; import com.sczx.order.thirdpart.dto.CarModelSimpleDTO;
import com.sczx.order.thirdpart.dto.CompanyStoreDTO; import com.sczx.order.thirdpart.dto.CompanyStoreDTO;
import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -118,6 +119,9 @@ public class OrderDTO {
@ApiModelProperty("租电套餐id") @ApiModelProperty("租电套餐id")
private Long rentBatteyRuleId; private Long rentBatteyRuleId;
@ApiModelProperty("租电套餐信息")
private RentBatteyRuleDTO rentBatteyRule;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;

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

@ -172,6 +172,11 @@ public class OrderServiceImpl implements OrderService {
CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString())); CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString()));
CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId()); CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId());
RentBatteyRuleDTO rentBatteyRuleDTO = null;
if(orderMainPO.getRentBatteyRuleId()!=null){
rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
orderDTO.setRentBatteyRule(rentBatteyRuleDTO);
}
orderDTO.setCarModelSimpleDTO(carModelSimpleDTO); orderDTO.setCarModelSimpleDTO(carModelSimpleDTO);
orderDTO.setCompanyStoreDTO(companyStoreDTO); orderDTO.setCompanyStoreDTO(companyStoreDTO);
LambdaQueryWrapper<OrderSubPO> orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderSubPO> orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>();