From f091a26b18e8d79a0ee7bab176c739bb0e7ce139 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Fri, 20 Nov 2020 16:11:47 +0800
Subject: [PATCH] C端--导出医院数据
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 454c824..20b935b 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
@@ -125,6 +125,7 @@
} else {
reMsg = "单次支付未成功，不允许预扣费！";
bcode = ConsumptionConstant.BUSINESS_CODE_FAIL;
+ isSuccess = false;
}
} else {
//先获取这个业务关联的扣费记录
@@ -202,6 +203,7 @@
} else {
reMsg = "单次支付未成功，不允许扣费！";
bcode = ConsumptionConstant.BUSINESS_CODE_FAIL;
+ isSuccess=false;
}
} else {
//先获取这个业务关联的扣费记录
@@ -281,6 +283,7 @@
//预扣费成功
reMsg = "单次支付模拟退还扣费成功！";
bcode = ConsumptionConstant.BUSINESS_CODE_RETURN_DEDUCTION;
+ isSuccess=true;
} else {
reMsg = "单次支付未成功，不允许退扣费！";
bcode = ConsumptionConstant.BUSINESS_CODE_FAIL;
@@ -415,6 +418,7 @@
//预扣费成功
reMsg = "单次支付模拟已经扣费成功！";
bcode = ConsumptionConstant.BUSINESS_CODE_IS_DEDUCTION;
+ isSuccess = true;
//消息队列通知
MessageToBI(consumptionRequest);
} else {
@@ -553,6 +557,8 @@
consumptionVo.setBusinessId(consumptionRequest.getBusinessId());
consumptionVo.setBcode(bcode);
consumptionVo.setRecordType(recordType);
+ logger.info("扣费业务返回参数实体："+consumptionRequest.toString());
+ logger.info("扣费业务返回其他参数：bcode:{},recordType:{},reMsg:{},isSuccess:{}",bcode,recordType,reMsg,isSuccess);
if (isSuccess) {
return ResultBody.ok().data(consumptionVo).msg(reMsg);
} else {
@@ -591,12 +597,13 @@
* 参数验证
*/
private Boolean VateParams(ConsumptionRequest consumptionRequest) {
+ logger.info("收到扣费请求的参数："+consumptionRequest.toString());
if (consumptionRequest != null) {
//从请求头获取医院和科室id
String hosId = consumptionRequest.getHospitalId().toString();
String depId = consumptionRequest.getDepartmentId().toString();
String doctorId = consumptionRequest.getDoctorId().toString();
- String diaId = consumptionRequest.getDiaId().toString();
+ String diaId = consumptionRequest.getDiaId();
if (StringUtils.isNotBlank(consumptionRequest.getBusinessId())
&& consumptionRequest.getConsumptionCount() > 0
&& StringUtils.isNotBlank(hosId)
@@ -637,7 +644,7 @@
} else {
returnMap.put("vateRe", false);
returnMap.put("vateMsg", "余额获取异常,data为空!");
- logger.error("医院id:【{}】余额获取异常！", hospitalId);
+ logger.info("医院id:【{}】余额获取异常！", hospitalId);
}
} else {
returnMap.put("vateRe", false);
@@ -745,7 +752,7 @@
"\",\"date\":\"" + DateUtils.formatDate(new Date(), "yyyy-MM-dd") + "\"}";
rabbitTemplate.convertAndSend(ConsumptionConstant.EXCHANGE_DATA, ConsumptionConstant.ROUTINGKEY_DATA + envName, context);
- log.error("骨龄评价扣费消息已发送：" + context);
+ log.info("骨龄评价扣费消息已发送：" + context);
}
/**
@@ -755,11 +762,13 @@
* @return
*/
private Boolean departmentIsPay(ConsumptionRequest consumptionRequest) {
+ log.info("查看当前科室是否开通了单次支付请求参数："+consumptionRequest.toString());
PayManager payManager = payManagerService.findByObject(consumptionRequest.getHospitalId(), consumptionRequest.getDepartmentId());
+ log.info("查看当前科室是否开通了单次支付请求查询后数据："+payManager.toString());
if (payManager == null) {
return false;
} else {
- return payManager.getId() > 0;
+ return payManager.getId()!=null;
}
}
@@ -770,7 +779,9 @@
* @return
*/
private Boolean departmentPayStatus(ConsumptionRequest consumptionRequest) {
+ log.info("查看当前科室当前诊断id的支付状态是否成功请求参数："+consumptionRequest.toString());
SaasClientPay saasClientPay = saasClientPayService.findModelByObject(consumptionRequest.getHospitalId(), consumptionRequest.getDepartmentId(), consumptionRequest.getDiaId());
+ log.info("查看当前科室当前诊断id的支付状态是否成功查询后数据："+saasClientPay.toString());
if (saasClientPay == null) {
return false;
} else {
--
Gitblit v1.8.0