From a0bc860a06e1aa9eca7609bef0f0747776d8fb04 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 16 Apr 2021 14:33:46 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
index 0add839..b53939a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
@@ -522,14 +522,17 @@
//3.3 扣费成功 同时更新预扣记录数据的套餐id和数据更新时间
consumptionRecord.setProOrderDetailId(productOrderDetail.getId());
consumptionRecord.setUpdateTime(new Date());
- if (!SaveConsumptionRecord(consumptionRecord)) {
- logger.info("业务编号:【{}】更新预扣费的套餐id！", consumptionRequest.getBusinessId());
+ if (SaveConsumptionRecord(consumptionRecord)) {
+ //消息队列通知
+ MessageToBI(consumptionRequest);
+ //已经扣费
+ logger.info("业务编号:【{}】该业务已经扣费！", consumptionRequest.getBusinessId());
+ return true;
}
- //消息队列通知
- MessageToBI(consumptionRequest);
- //已经扣费
- logger.info("业务编号:【{}】该业务已经扣费！", consumptionRequest.getBusinessId());
- return true;
+ else
+ {
+ logger.info("业务编号:【{}】更新预扣费数据失败！", consumptionRequest.getBusinessId());
+ }
} else {
logger.info("业务编号:【{}】预扣费执行失败！", consumptionRequest.getBusinessId());
}
--
Gitblit v1.8.0