From 4a8009e51b236c8de961b643c885543a680efe89 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 30 Jun 2020 16:30:32 +0800
Subject: [PATCH] 修改bug，，网关添加短信修改密码的端口
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 5026604..8873eda 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
@@ -21,6 +21,8 @@
import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -101,14 +103,12 @@
//记录类型
int recordType=ConsumptionConstant.BEFORE_DEDUCTION;
//业务执行结果
- boolean isSuccess = false;
+ boolean isSuccess = true;
//业务执行结果信息
String reMsg = "";
if (VateParams(consumptionRequest)) {
//先获取这个业务关联的扣费记录
List<ConsumptionRecord> consumptionRecordList = GetBusinessConsumptionList(consumptionRequest.getBusinessId());
- Long hospitalId = Long.valueOf(httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER));
- Long departmentId = Long.valueOf(httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER));
//1.先检查是否已经扣费
if (!isBeforeDeduction(consumptionRecordList, ConsumptionConstant.DEDUCTION)) {
//2.没有扣费，检查是否已经预扣费
@@ -118,16 +118,17 @@
//4.余额充足 获取要扣的套餐 写预扣费记录
if (beforeConsumption(consumptionRequest)) {
//预扣费成功
- isSuccess = true;
reMsg = "预扣费成功！";
bcode = ConsumptionConstant.BUSINESS_CODE_IS_BEFORE_DEDUCTION;
} else {
//预扣费执行失败
+ isSuccess = false;
reMsg = "预扣费执行失败！";
bcode = ConsumptionConstant.BUSINESS_CODE_ERROR;
}
} else {
//余额不足
+ isSuccess = false;
reMsg = "余额不足或获取失败！";
bcode = ConsumptionConstant.BUSINESS_CODE_FAIL;
}
@@ -142,6 +143,7 @@
bcode = ConsumptionConstant.BUSINESS_CODE_IS_DEDUCTION;
}
} else {
+ isSuccess = false;
reMsg = "传入参数有误！";
bcode = ConsumptionConstant.BUSINESS_CODE_PARAMS_ERROR;
}
@@ -162,14 +164,14 @@
//记录类型
int recordType=ConsumptionConstant.DEDUCTION;
//业务执行结果
- boolean isSuccess = false;
+ boolean isSuccess = true;
//业务执行结果信息
String reMsg = "";
if (VateParams(consumptionRequest)) {
//先获取这个业务关联的扣费记录
List<ConsumptionRecord> consumptionRecordList = GetBusinessConsumptionList(consumptionRequest.getBusinessId());
Long hospitalId = Long.valueOf(httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER));
- Long departmentId = Long.valueOf(httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER));
+
//1.先检查是否已经扣费
if (!isBeforeDeduction(consumptionRecordList, ConsumptionConstant.DEDUCTION)) {
//2.没有扣费，检查是否已经预扣费
@@ -182,22 +184,24 @@
logger.info("医院id:【{}】AI返回结果应该不走预扣，目前确已经预扣！", hospitalId);
} else {
//预扣费执行失败
+ isSuccess = false;
reMsg = "预扣费执行失败！";
bcode = ConsumptionConstant.BUSINESS_CODE_ERROR;
return ResultReturn(consumptionRequest, bcode,ConsumptionConstant.BEFORE_DEDUCTION, reMsg, isSuccess);
}
} else {
//余额不足
+ isSuccess = false;
reMsg = "余额不足或获取失败！";
bcode = ConsumptionConstant.BUSINESS_CODE_FAIL;
return ResultReturn(consumptionRequest, bcode,ConsumptionConstant.BEFORE_DEDUCTION, reMsg, isSuccess);
}
}
if (consumptionBusiess(consumptionRequest, consumptionRecordList)) {
- isSuccess = true;
reMsg = "该业务扣费成功！";
bcode = ConsumptionConstant.BUSINESS_CODE_IS_DEDUCTION;
} else {
+ isSuccess = false;
reMsg = "该业务扣费失败！";
bcode = ConsumptionConstant.BUSINESS_CODE_FAIL;
}
@@ -207,6 +211,7 @@
bcode = ConsumptionConstant.BUSINESS_CODE_IS_DEDUCTION;
}
} else {
+ isSuccess = false;
reMsg = "传入参数有误！";
bcode = ConsumptionConstant.BUSINESS_CODE_PARAMS_ERROR;
}
@@ -255,6 +260,7 @@
consumptionRecordNew.setLastRecordId(consumptionRecord.getId());
if (SaveConsumptionRecord(consumptionRecordNew))
{
+ isSuccess=true;
reMsg = "有预扣，写退还预扣成功！";
bcode = ConsumptionConstant.BUSINESS_CODE_RETURN_BEFORE_DEDUCTION;
}
@@ -404,6 +410,7 @@
bcode = ConsumptionConstant.BUSINESS_CODE_PARAMS_ERROR;
}
} else {
+ isSuccess = true;
//已经扣费
reMsg = "该业务已经扣费！";
bcode = ConsumptionConstant.BUSINESS_CODE_IS_DEDUCTION;
@@ -508,7 +515,7 @@
*/
private Boolean beforeConsumption(ConsumptionRequest consumptionRequest) {
Long hospitalId = Long.valueOf(httpServletRequest.getHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER));
- Long departmentId = Long.valueOf(httpServletRequest.getHeader(SecurityConstants.USER_DEP_ID_HEADER));
+
ProductOrderDetail productOrderDetail = deductionDepartmentProduct(consumptionRequest.getConsumptionCount());
if (productOrderDetail != null) {
ConsumptionRecord consumptionRecord = new ConsumptionRecord();
--
Gitblit v1.8.0