diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 8a61eb3a9..e5ecb7476 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -263,6 +263,7 @@ batteryChargeReport: getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + mfrID: mfr8944567890598756 # dubbo配置 dubbo: diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 5b4c6be6e..669e2e1b4 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -258,6 +258,7 @@ batteryChargeReport: getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + mfrID: mfr8944567890598756 # dubbo配置 dubbo: diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 6daebd8d6..53d67a247 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -281,6 +281,7 @@ batteryChargeReport: getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + mfrID: mfr8944567890598756 # dubbo配置 dubbo: diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index 2825f546b..80c91af3d 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -256,6 +256,7 @@ batteryChargeReport: getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + mfrID: mfr8944567890598756 # dubbo配置 dubbo: diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 06f4ea47f..7f073a6e6 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -157,6 +157,7 @@ batteryChargeReport: getTaskIdApi: /api/docking/api/evaluate apiPrefix: /api/docking/report/ token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ== + mfrID: mfr8944567890598756 # sms4j sms: diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java index c52c5779b..c004052c5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java @@ -76,7 +76,7 @@ public class OrderVO { /** * 结算时间 */ - private String settlemetTime; + private String settlementTime; /** * 结算金额(指实际产生的消费,包括本金支付,微信支付等) @@ -156,4 +156,6 @@ public class OrderVO { * 会员id */ private String memberId; + + private String phoneNumber; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index ffeae8c45..29b54f86e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -3245,9 +3245,10 @@ diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java index 4ff5e9124..db7932dab 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java @@ -53,6 +53,9 @@ public class BatteryChargeReportService { @Value("${batteryChargeReport.token}") private String token; + @Value("${batteryChargeReport.mfrID}") + private String mfrID; + @Autowired private RedisCache redisCache; @@ -211,7 +214,7 @@ public class BatteryChargeReportService { .collect(Collectors.toSet()); BatteryChargeReportData data = BatteryChargeReportData.builder() - .mfrID("") + .mfrID(mfrID) .siteName(stationVO.getStationName()) .siteAddress(stationVO.getAddress()) .siteLongitude(stationVO.getStationLng()) @@ -221,7 +224,7 @@ public class BatteryChargeReportService { .businessStatus(Constants.ZERO) // 营业状态 0-正常; 1-停运 .sitePileNumber(snList.size()) // 桩数量 .siteGunNumber(pileConnectorInfoVOS.size()) - .phone("") // 用户手机号码 + .phone(orderVO.getPhoneNumber()) // 用户手机号码 .siteCode(stationVO.getId()) .pileCode(orderVO.getPileSn()) .gunNo(orderVO.getConnectorCode())