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

update

Browse Source
This commit is contained in:
YAS\29473
2025-05-23 18:48:38 +08:00
parent d94b8ebcba
commit 267e4e523f
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java vendored
View File

@@ -169,14 +169,6 @@ public class NotificationService {
ThirdPartyPlatformService platformService = ThirdPartyPlatformFactory.getInvokeStrategy(secretInfoVO.getPlatformType()); ThirdPartyPlatformService platformService = ThirdPartyPlatformFactory.getInvokeStrategy(secretInfoVO.getPlatformType());
//充电订单信息推送 //充电订单信息推送
platformService.notificationChargeOrderInfo(orderCode, secretInfoVO); platformService.notificationChargeOrderInfo(orderCode, secretInfoVO);
// 测试联联之禾时发现会同时有两条notification_orderInfo请求发送,原因是异步走了lianLianService中的方法,因此请求一条出错,一条成功
// 注释掉另一个异步方法中的判断联联的if判断,看看效果
if(secretInfoVO.getPlatformType().equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode())){
//订单信息推送
platformService.notificationChargeOrderInfo(orderCode);
//推送停止充电结果
platformService.notificationStopChargeResult(orderCode);
}
} catch (Exception e) { } catch (Exception e) {
logger.error("充电订单信息推送error", e); logger.error("充电订单信息推送error", e);
} }

1
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -878,6 +878,7 @@ public class LianLianServiceImpl implements LianLianService {
*/ */
@Override @Override
public String pushOrderInfo(String orderCode) { public String pushOrderInfo(String orderCode) {
logger.info("LianLianServiceImpl pushOrderInfo start");
List<ChargeDetail> chargeDetails = new ArrayList<>(); List<ChargeDetail> chargeDetails = new ArrayList<>();
// 根据订单号查询出信息 // 根据订单号查询出信息
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);

7
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java vendored
View File

@@ -930,7 +930,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
*/ */
@Override @Override
public String notificationChargeOrderInfo(String orderCode) { public String notificationChargeOrderInfo(String orderCode) {
log.info("LianLianPlatformServiceImpl.notificationChargeOrderInfo start");
// 根据订单号查询出信息 // 根据订单号查询出信息
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
@@ -963,7 +963,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
.startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())) .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()))
.endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime())) .endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime()))
.paymentAmount(orderBasicInfo.getPayAmount()) .paymentAmount(orderBasicInfo.getPayAmount())
.orderType(Constants.one)
// .payChannel() // .payChannel()
.stopReason(0) .stopReason(0)
// .chargeDetails() // .chargeDetails()
@@ -1001,7 +1000,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
List<ChargeDetail> chargeDetails = new ArrayList<>(); List<ChargeDetail> chargeDetails = new ArrayList<>();
for (BillingPriceVO billingPriceVO : billingList) { for (BillingPriceVO billingPriceVO : billingList) {
detail = new ChargeDetail(); detail = new ChargeDetail();
//改为YYYY-MM-DD HH:mm:ss格式 /* //改为YYYY-MM-DD HH:mm:ss格式
//拼接 开始时间和结束时间 //拼接 开始时间和结束时间
String startTime = billingPriceVO.getStartTime(); String startTime = billingPriceVO.getStartTime();
String endTime = billingPriceVO.getEndTime(); String endTime = billingPriceVO.getEndTime();
@@ -1009,7 +1008,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
billingPriceVO.setStartTime(DateUtils.formatTime(startTime)); billingPriceVO.setStartTime(DateUtils.formatTime(startTime));
billingPriceVO.setEndTime(DateUtils.formatTime(endTime)); billingPriceVO.setEndTime(DateUtils.formatTime(endTime));
billingPriceVO.getStartTime(); billingPriceVO.getStartTime();*/
if (StringUtils.equals(billingPriceVO.getTimeType(), "1")) { if (StringUtils.equals(billingPriceVO.getTimeType(), "1")) {
// 尖时段 // 尖时段
detail.setDetailStartTime(billingPriceVO.getStartTime()); detail.setDetailStartTime(billingPriceVO.getStartTime());