From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
index 3ef3e5f..dc029ef 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
@@ -184,9 +184,11 @@
}
else if(modelDetail==null)
{
- Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
- if (!isResult) {
- return ResultBody.failed().msg("套餐充入失败,支付开通失败！");
+ if(payManager.getEnabled()){
+ Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
+ if (!isResult) {
+ return ResultBody.failed().msg("套餐充入失败,支付开通失败！");
+ }
}
}
} else {
--
Gitblit v1.8.0