修改单次支付， 禁用状态可以添加套餐的bug

zhaoxiaohao

2021-02-26 42732fda8d3fdef36b33e2c46f2988df7424bf6a

修改单次支付， 禁用状态可以添加套餐的bug

 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 {

 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>

 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>

 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">

 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">

 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>

 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">

 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">

 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">

 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">

 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">

 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">

 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>

 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>