From a2537c02973b7b1a55889f76ab753303c9763700 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 15 Apr 2021 11:48:05 +0800
Subject: [PATCH] 修改医生模板,修改页面的bug

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java |   25 +++++++++++++------------
 1 files changed, 13 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 0602227..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,19 +519,20 @@
             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;
                 }
-                //消息队列通知
-                MessageToBI(consumptionRequest);
-                //已经扣费
-                logger.info("业务编号:【{}】该业务已经扣费!", consumptionRequest.getBusinessId());
-                return true;
+                else
+                {
+                    logger.info("业务编号:【{}】更新预扣费数据失败!", consumptionRequest.getBusinessId());
+                }
             } else {
                 logger.info("业务编号:【{}】预扣费执行失败!", consumptionRequest.getBusinessId());
             }

--
Gitblit v1.8.0