From 77162dbce2f3c8334c3c7b3a80c0e46c83eaf402 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 11 Aug 2020 20:35:06 +0800
Subject: [PATCH] 1.修改首页统计数据的显示文字 2.修改删除删除充值记录后,读片量不扣减问题
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java | 48 ++++++++++++++++++++---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html | 2
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html | 33 +++++++++-------
3 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
index dea646c..fedef3d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
@@ -7,6 +7,7 @@
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.utils.StringUtils;
+import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.model.ProductOrderRecord;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
@@ -28,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -215,16 +217,48 @@
* 删除
*/
@ApiOperation(value = "删除")
+ @Transactional(rollbackFor = Exception.class)
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v = productOrderRecordService.removeById(id);
- if (v) {
- if (!businessRecordsService.recordBusinessData("删除订单明细:" + id, id.toString())) {
- //log.error(String.format("删除订单明细id为：{1}",id));
+ ProductOrderRecord productOrderRecord=productOrderRecordService.getById(id);
+ if (productOrderRecord != null) {
+ Map<String,Object> detailSelect=new HashMap<String,Object>();
+ detailSelect.put("pro_id",productOrderRecord.getProId());
+ detailSelect.put("order_id",productOrderRecord.getOrderId());
+ List<ProductOrderDetail> productOrderDetailList=productOrderDetailService.listByMap(detailSelect);
+ if (productOrderDetailList != null&&productOrderDetailList.size()>0) {
+ ProductOrderDetail productOrderDetail=productOrderDetailList.get(0);
+ if (productOrderDetail.getAilightCount() == productOrderRecord.getAilightCount()&&
+ productOrderDetail.getRecordCount()==productOrderRecord.getRecordCount()) {
+ //读片量和报告量都没有改变 可以删除
+ //删记录
+ boolean isdel= productOrderRecordService.removeById(id);
+ //删套餐
+ boolean isdelDetail=productOrderDetailService.removeById(productOrderDetail.getId());
+ //写记录
+ boolean record=businessRecordsService.recordBusinessData("删除订单明细:" + id, id.toString());
+ log.info(String.format("删除订单明细id为：{1}",id));
+ if (isdelDetail&&isdel) {
+ return ResultBody.ok().msg("套餐删除成功!");
+ }
+ else
+ {
+ return ResultBody.failed().msg("当前套餐删除失败!");
+ }
+ }
+ else
+ {
+ return ResultBody.failed().msg("当前套餐已经使用,无法删除!");
+ }
}
- return ResultBody.ok().msg("删除成功");
- } else {
- return ResultBody.failed().msg("删除失败");
+ else
+ {
+ return ResultBody.failed().msg("无相关套餐记录!");
+ }
+ }
+ else
+ {
+ return ResultBody.failed().msg("不存在该条记录!");
}
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
index 0f9a8ef..d985a0f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
@@ -35,7 +35,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!syshospital">
- <p class="big-font" id="h_hospital">无权查看</p>
+ <p class="big-font" id="h_hospital"></p>
</a>
</div>
</div>
@@ -46,7 +46,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!product">
- <p class="big-font" id="u_product">无权查看</p>
+ <p class="big-font" id="u_product"></p>
</a>
</div>
</div>
@@ -57,7 +57,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!verifyRecharge">
- <p class="big-font" id="t_product">无权查看</p>
+ <p class="big-font" id="t_product"></p>
</a>
</div>
</div>
@@ -68,7 +68,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!feedback">
- <p class="big-font" id="u_feedback">无权查看</p>
+ <p class="big-font" id="u_feedback"></p>
</a>
</div>
</div>
@@ -79,7 +79,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!dataneed">
- <p class="big-font" id="d_dataneed">无权查看</p>
+ <p class="big-font" id="d_dataneed"></p>
</a>
</div>
</div>
@@ -92,7 +92,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!doctor">
- <p class="big-font" id="h_doctor">无权查看</p>
+ <p class="big-font" id="h_doctor"></p>
</a>
</div>
</div>
@@ -103,7 +103,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!doctor">
- <p class="big-font" id="c_doctor">无权查看</p>
+ <p class="big-font" id="c_doctor"></p>
</a>
</div>
</div>
@@ -114,7 +114,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!doctor">
- <p class="big-font" id="ht_doctor">无权查看</p>
+ <p class="big-font" id="ht_doctor"></p>
</a>
</div>
</div>
@@ -125,7 +125,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!doctor">
- <p class="big-font" id="u_signing">无权查看</p>
+ <p class="big-font" id="u_signing"></p>
</a>
</div>
</div>
@@ -136,7 +136,7 @@
</div>
<div class="layui-card-body layuiadmin-card-list">
<a href="/#!doctor">
- <p class="big-font" id="d_isanswer">无权查看</p>
+ <p class="big-font" id="d_isanswer"></p>
</a>
</div>
</div>
@@ -193,6 +193,7 @@
let util = layui.util;
let $ = layui.jquery;
var counts = 0;
+ var noData="无权查看";
// 加载医院统计数据
var loadHospitalChart = function (datatype) {
admin.req("api-user/syshospital/chartHospital?datatype=" + datatype, {}, function (data) {
@@ -387,6 +388,7 @@
}
}, "get");
}
+
//加载读片图表
var loadaiphotoChart = function (dataType) {
var nowYear = new Date().getFullYear();
@@ -473,7 +475,6 @@
//数据需求
loadOprationChart(2);
$("#d_dataneed").html(counts);
-
//H端医生
loadDoctorChart(4);
$("#h_doctor").html(counts);
@@ -519,10 +520,9 @@
loadDoctorChart(5);
$("#ht_doctor").html(counts);
loadProductChart();
+ $("#u_product").html(noData);
+ $("#t_product").html(noData);
} else if (element.code == "sale") {
- //正式医院
- loadHospitalChart(0);
- $("#h_hospital").html(counts);
//正式医院
loadHospitalChart(0);
$("#h_hospital").html(counts);
@@ -544,8 +544,13 @@
//签约医生
loadDoctorChart(1);
$("#u_signing").html(counts);
+
+ $("#u_product").html(noData);
+ $("#t_product").html(noData);
//医答医生
loadDoctorChart(2);
+ $("#d_isanswer").html(counts);
+
loadContractChart();
loadProductChart();
loadreportChart(0);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index a393c76..011453c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -104,7 +104,7 @@
// 工具条点击事件
table.on('tool(product-table)', function (obj) {
if (obj.event === 'del') { // 删除
- layer.confirm('确定要删除吗？', function (i) {
+ layer.confirm('您确定要删除这次充值吗？删除后不可恢复!', function (i) {
layer.close(i);
layer.load(2);
admin.req('api-opration/productorderrecord/' + obj.data.id, {}, function (data) {
--
Gitblit v1.8.0