mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-19 18:45:03 +08:00
update
This commit is contained in:
@@ -40,7 +40,7 @@ public class BusinessOrderController extends BaseController {
|
||||
RestApiResponse<?> response = null;
|
||||
try {
|
||||
BusinessOrderDetailInfoVO vo = orderBasicInfoService.getBusinessOrderDetail(orderCode);
|
||||
response = new RestApiResponse<>(ImmutableMap.of("BusinessConnectorInfo", vo));
|
||||
response = new RestApiResponse<>(ImmutableMap.of("BusinessOrderDetailInfo", vo));
|
||||
} catch (Exception e) {
|
||||
logger.error("通过订单编号查询订单信息详情 error", e);
|
||||
response = new RestApiResponse<>(e);
|
||||
|
||||
@@ -5729,13 +5729,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
if (CollectionUtils.isNotEmpty(priceList)) {
|
||||
vo.setPriceList(priceList);
|
||||
}
|
||||
vo.setOrderStatus(orderVO.getOrderStatus());
|
||||
vo.setCreateTime(orderVO.getCreateTime());
|
||||
vo.setStartChargeTime(orderVO.getStartTime());
|
||||
vo.setEndChargeTime(orderVO.getEndTime());
|
||||
|
||||
vo.setOrderCode(orderVO.getOrderCode());
|
||||
vo.setStationName(orderVO.getStationName());
|
||||
if (StringUtils.isNotBlank(orderVO.getThirdPartyType())) {
|
||||
vo.setOrderSource(orderVO.getThirdPartyType());
|
||||
String type = ThirdPlatformTypeEnum.getTypeLabelByTypeCode(orderVO.getThirdPartyType());
|
||||
vo.setOrderSource(type);
|
||||
} else {
|
||||
vo.setOrderSource(Constants.WAN_CHE_CHONG_MINI_PROGRAM);
|
||||
}
|
||||
@@ -5746,8 +5749,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
vo.setPileSn(orderVO.getPileSn());
|
||||
vo.setPileConnectorCode(orderVO.getPileConnectorCode());
|
||||
vo.setEndSOC(orderVO.getEndSoc());
|
||||
vo.setChargeTime(orderVO.getChargingTime());
|
||||
vo.setChargeDegree(orderVO.getChargingDegree());
|
||||
vo.setChargeTime(DateUtils.getDatePoor(DateUtils.parseDate(orderVO.getEndTime()), DateUtils.parseDate(orderVO.getStartTime())));
|
||||
vo.setChargeDegree(orderVO.getTotalPower());
|
||||
vo.setReason(orderVO.getReason());
|
||||
|
||||
vo.setOrderAmount(orderVO.getOrderAmount());
|
||||
|
||||
@@ -239,6 +239,8 @@ public class BusinessOrderDetailInfoVO {
|
||||
|
||||
private String phoneNumber;
|
||||
|
||||
private String orderStatus;
|
||||
|
||||
private String cardNumber;
|
||||
|
||||
private List<BillingPriceVO> priceList;
|
||||
|
||||
Reference in New Issue
Block a user