From 6d0fee3cdc8cb213d0388ffa2e7ed7a091a1ea4c Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Thu, 08 Apr 2021 13:58:41 +0800
Subject: [PATCH] 咨询小程序相关功能

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 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 40225a4..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
@@ -519,20 +519,21 @@
             consumptionRecordNew.setCreateTime(new Date());
 
             if (SaveConsumptionRecord(consumptionRecordNew)) {
-                //3.3 扣费成功 如果套餐id变化,则更新预扣费的套餐id
-                    if (!consumptionRecordNew.getProOrderDetailId().equals(consumptionRecord.getProOrderDetailId())) {
-                        consumptionRecord.setProOrderDetailId(productOrderDetail.getId());
-                        consumptionRecord.setUpdateTime(new Date());
-                        if (!SaveConsumptionRecord(consumptionRecord)) {
-                            logger.info("业务编号:【{}】更新预扣费的套餐id!", consumptionRequest.getBusinessId());
-                        }
-                    }
+                //3.3 扣费成功 同时更新预扣记录数据的套餐id和数据更新时间
+                consumptionRecord.setProOrderDetailId(productOrderDetail.getId());
+                consumptionRecord.setUpdateTime(new Date());
+                if (SaveConsumptionRecord(consumptionRecord)) {
                     //消息队列通知
                     MessageToBI(consumptionRequest);
                     //已经扣费
                     logger.info("业务编号:【{}】该业务已经扣费!", consumptionRequest.getBusinessId());
                     return true;
-                } else {
+                }
+                else
+                {
+                    logger.info("业务编号:【{}】更新预扣费数据失败!", consumptionRequest.getBusinessId());
+                }
+            } else {
                 logger.info("业务编号:【{}】预扣费执行失败!", consumptionRequest.getBusinessId());
             }
         } else {

--
Gitblit v1.8.0