From 5a5844652f388bbb08c9153d91d9fc2c7d5d18d2 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 16:31:47 +0800
Subject: [PATCH] 测试复现查询光片剩余量的数量问题

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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..40225a4 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,18 +519,20 @@
             consumptionRecordNew.setCreateTime(new Date());
 
             if (SaveConsumptionRecord(consumptionRecordNew)) {
-                //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 {
+                //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 {
                 logger.info("业务编号:【{}】预扣费执行失败!", consumptionRequest.getBusinessId());
             }
         } else {

--
Gitblit v1.8.0