Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-06-29 31de20695ac5fc8562c5922fcbe8729ae4e146a1

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java

@@ -101,7 +101,7 @@
        //记录类型
        int recordType=ConsumptionConstant.BEFORE_DEDUCTION;
        //业务执行结果
        boolean isSuccess = false;
        boolean isSuccess = true;
        //业务执行结果信息
        String reMsg = "";
        if (VateParams(consumptionRequest)) {
@@ -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,7 +164,7 @@
        //记录类型
        int recordType=ConsumptionConstant.DEDUCTION;
        //业务执行结果
        boolean isSuccess = false;
        boolean isSuccess = true;
        //业务执行结果信息
        String reMsg = "";
        if (VateParams(consumptionRequest)) {
@@ -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;