autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-24 00:59:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Lemon
2026-01-21 16:01:23 +08:00
parent cf9ffcbd59
commit c24c66e052
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessOrderController.java
View File

@@ -40,7 +40,7 @@ public class BusinessOrderController extends BaseController {
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
BusinessOrderDetailInfoVO vo = orderBasicInfoService.getBusinessOrderDetail(orderCode); BusinessOrderDetailInfoVO vo = orderBasicInfoService.getBusinessOrderDetail(orderCode);
response = new RestApiResponse<>(ImmutableMap.of("BusinessConnectorInfo", vo)); response = new RestApiResponse<>(ImmutableMap.of("BusinessOrderDetailInfo", vo));
} catch (Exception e) { } catch (Exception e) {
logger.error("通过订单编号查询订单信息详情 error", e); logger.error("通过订单编号查询订单信息详情 error", e);
response = new RestApiResponse<>(e); response = new RestApiResponse<>(e);

9
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -5729,13 +5729,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (CollectionUtils.isNotEmpty(priceList)) { if (CollectionUtils.isNotEmpty(priceList)) {
vo.setPriceList(priceList); vo.setPriceList(priceList);
} }
vo.setOrderStatus(orderVO.getOrderStatus());
vo.setCreateTime(orderVO.getCreateTime()); vo.setCreateTime(orderVO.getCreateTime());
vo.setStartChargeTime(orderVO.getStartTime()); vo.setStartChargeTime(orderVO.getStartTime());
vo.setEndChargeTime(orderVO.getEndTime()); vo.setEndChargeTime(orderVO.getEndTime());
vo.setOrderCode(orderVO.getOrderCode()); vo.setOrderCode(orderVO.getOrderCode());
vo.setStationName(orderVO.getStationName()); vo.setStationName(orderVO.getStationName());
if (StringUtils.isNotBlank(orderVO.getThirdPartyType())) { if (StringUtils.isNotBlank(orderVO.getThirdPartyType())) {
vo.setOrderSource(orderVO.getThirdPartyType()); String type = ThirdPlatformTypeEnum.getTypeLabelByTypeCode(orderVO.getThirdPartyType());
vo.setOrderSource(type);
} else { } else {
vo.setOrderSource(Constants.WAN_CHE_CHONG_MINI_PROGRAM); vo.setOrderSource(Constants.WAN_CHE_CHONG_MINI_PROGRAM);
} }
@@ -5746,8 +5749,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
vo.setPileSn(orderVO.getPileSn()); vo.setPileSn(orderVO.getPileSn());
vo.setPileConnectorCode(orderVO.getPileConnectorCode()); vo.setPileConnectorCode(orderVO.getPileConnectorCode());
vo.setEndSOC(orderVO.getEndSoc()); vo.setEndSOC(orderVO.getEndSoc());
vo.setChargeTime(orderVO.getChargingTime()); vo.setChargeTime(DateUtils.getDatePoor(DateUtils.parseDate(orderVO.getEndTime()), DateUtils.parseDate(orderVO.getStartTime())));
vo.setChargeDegree(orderVO.getChargingDegree()); vo.setChargeDegree(orderVO.getTotalPower());
vo.setReason(orderVO.getReason()); vo.setReason(orderVO.getReason());
vo.setOrderAmount(orderVO.getOrderAmount()); vo.setOrderAmount(orderVO.getOrderAmount());

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java
View File

@@ -239,6 +239,8 @@ public class BusinessOrderDetailInfoVO {
private String phoneNumber; private String phoneNumber;
private String orderStatus;
private String cardNumber; private String cardNumber;
private List<BillingPriceVO> priceList; private List<BillingPriceVO> priceList;