From 8fad687b5b0c1144d88f02b76fb3706a101d6dcb Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 16:43:15 +0800
Subject: [PATCH] 修复扣费成功后,更新预扣费记录的数据更新时间bug

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

--
Gitblit v1.8.0