From 42732fda8d3fdef36b33e2c46f2988df7424bf6a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 26 Feb 2021 11:08:17 +0800
Subject: [PATCH] 修改单次支付， 禁用状态可以添加套餐的bug
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java | 8 +++++---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html | 2 +-
14 files changed, 19 insertions(+), 17 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 {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
index 9714231..8bcc46f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
@@ -31,7 +31,7 @@
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off" >
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">租户</label>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index 67ec24c..6272cef 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -36,7 +36,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">需求类型</label>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
index cac2db3..26d43ab 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -52,7 +52,7 @@
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden" />
<div style="display:flex">
<div class="layui-form-item">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
index 98cbfd4..3b73c15 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
@@ -1,4 +1,4 @@
-<form id="app-form-add" lay-filter="app-form-add" class="layui-form model-form">
+<form id="app-form-add" lay-filter="app-form-add" autocomplete="off" class="layui-form model-form">
<input name="id" type="hidden" />
<div style="display:flex">
<div class="layui-form-item">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html
index c803a5b..ace68b3 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html
@@ -36,7 +36,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label" style="width: 75px;">所在医院</label>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index 7c34ac0..43247df 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -1,4 +1,4 @@
-<form id="hospital-form" lay-filter="hospital-form" class="layui-form model-form" method="POST">
+<form id="hospital-form" lay-filter="hospital-form" autocomplete="off" class="layui-form model-form" method="POST">
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-sm7">
@@ -22,7 +22,7 @@
<div class="layui-col-sm5">
<label class="layui-form-label">医院联系人</label>
<div class="layui-input-block">
- <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+ <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;"/>
</div>
</div>
<div class="layui-col-sm5">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html
index 2a8256a..fc85053 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html
@@ -1,4 +1,4 @@
-<form id="health-form" lay-filter="health-form" class="layui-form model-form" method="POST">
+<form id="health-form" lay-filter="health-form" autocomplete="off" class="layui-form model-form" method="POST">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 150px;">服务</label>
<div class="layui-input-block">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html
index 06a9949..c97afdc 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html
@@ -1,4 +1,4 @@
-<form id="pay-form" lay-filter="pay-form" class="layui-form model-form" method="POST">
+<form id="pay-form" lay-filter="pay-form" autocomplete="off" class="layui-form model-form" method="POST">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 150px;">医院</label>
<div class="layui-input-block">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
index 786b527..0d135b6 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
@@ -1,4 +1,4 @@
-<form id="product-form" lay-filter="product-form" class="layui-form model-form" method="POST">
+<form id="product-form" lay-filter="product-form" class="layui-form model-form" method="POST" autocomplete="off" >
<div class="layui-form-item">
<label class="layui-form-label">产品类型</label>
<div class="layui-input-block">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 2c810d5..09bd761 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -1,4 +1,4 @@
-<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
+<form id="recharge-form" lay-filter="recharge-form" autocomplete="off" class="layui-form">
<div style="overflow-y: auto; height:700px;">
<div class="layui-tab">
<ul class="layui-tab-title">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
index 52ba677..ac0ff0b 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
@@ -1,4 +1,4 @@
-<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
+<form id="recharge-form" lay-filter="recharge-form" autocomplete="off" class="layui-form">
<div style="overflow-y: auto; height:700px;">
<div class="layui-tab">
<ul class="layui-tab-title">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
index 9d085e2..9151f11 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
@@ -32,7 +32,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">请选择：</label>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
index 041559d..7f4322a 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
@@ -31,7 +31,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">字典类型</label>
--
Gitblit v1.8.0