From c10ddf5cc30fc3f5d889f597e0a4d13fb52f048a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 11:51:24 +0800
Subject: [PATCH] 优化套餐充值
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 14 +++++++++-----
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 15 +++++++--------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 17 ++++++++++++-----
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index f5a92fc..ce57544 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -190,17 +190,16 @@
return ResultBody.failed("选择一个角色");
}
}
-
- /**
- * 限制只有创建医生的个数
- *
- */
- if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
- return ResultBody.failed("该部门创建人数已经达到上限");
- }
SysHospital sysHospital = sysHospitalMapper.selectById(sysDoctor.getHospitalId());
SysDepartment sysDepartment = sysDepartmentMapper.selectById(sysDoctor.getDepartmentId());
if (sysDoctor.getId() == null) {
+ /**
+ * 限制只有创建医生的个数
+ *
+ */
+ if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
+ return ResultBody.failed("该部门创建人数已经达到上限");
+ }
Long sysUserId = null;
//保存部门信息
ResultBody resultBody = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment, null);
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 27257d1..975f886 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
@@ -616,7 +616,9 @@
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
if ($("#contractNum").val() < listNum) {
@@ -748,21 +750,23 @@
});
function isthenNum(num) {
if (num <= 0) {
- return "请输入读片量大于0";
+ return "请输入合同读片充值量大于0";
}
var listData = admin.getTempData("t_tempProduct");
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
listNum += num;
if ($("#contractNum").val() == undefined || $("#contractNum").val() == "") {
- return "请输入读片量！";
+ return "请输入合同读片充值量！";
} else {
if ($("#contractNum").val() < listNum) {
- return "当前产品总数不得大于合同总量";
+ return "当前产品总数不得大于合同读片充值量";
} else {
return null;
}
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 cc711aa..343a3a7 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
@@ -513,6 +513,8 @@
//如果是异步请求数据方式，res即为你接口返回的信息。
//如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
var num = 0;
+ //已经充值的套餐
+ admin.putTempData("t_nowProduct", "");
res.data.forEach(element => {
if(element.proType==1){
if (element.enabled) {
@@ -728,7 +730,9 @@
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
if ($("#contractNum").val() < listNum) {
@@ -895,23 +899,26 @@
}
}
});
+ // $("#contractNum_not").val($("#contractNum").val() - num);
function isthenNum(num) {
if (num <= 0) {
- return "请输入读片量且大于0";
+ return "请输入合同读片充值量大于0";
}
var listData = admin.getTempData("t_tempProduct");
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
listNum += num;
if ($("#contractNum_not").val() == undefined || $("#contractNum_not").val() == "") {
- return "请输入读片量！";
+ return "请输入合同读片充值量！";
} else {
if ($("#contractNum_not").val() < listNum) {
- return "当前产品总数不得大于合同总量";
+ return "当前产品总数不得大于合同读片充值量";
} else {
return null;
}
--
Gitblit v1.8.0