From 88477b811b33e4f6a976ecd5be03bebd95aa17eb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 16:54:45 +0800
Subject: [PATCH] 添加 产品管理；合同管理；医院管理；医生管理；公司管理； 消费记录 的数据权限
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index 7325ba4..4020c8d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -1,8 +1,11 @@
package com.kidgrow.oprationcenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
@@ -73,12 +76,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping("/all")
- public PageResult findAllList(@RequestParam Map<String, Object> params) {
+ public PageResult findAllList(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return productOrderDetailService.findAllList(params);
+ return productOrderDetailService.findAllList(params,sysUser);
}
/**
@@ -123,7 +126,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -131,6 +134,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
if (v) {
return ResultBody.ok().data(productOrderDetail).msg("保存成功");
@@ -154,22 +161,17 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- //int v = productOrderDetailService.batchInsert(list);
- for (int i = 0; i < list.size(); i++) {
- if (!productOrderDetailService.saveOrUpdate(list.get(i))) {
- //写入订单明细失败，则删除订单记录数据
- Boolean e = productOrderService.removeById(list.get(0).getOrderId());
-// //删除已写入的订单明细
-// Map<String, Object> idList = new HashMap<String, Object>();
-// idList.put("orderId", list.get(i).getOrderId());
-// boolean delDetail = productOrderDetailService.removeByMap(idList);
- if (e)
- return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
- else
- return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
- }
+ Boolean v = productOrderDetailService.saveBatch(list);
+ if (v) {
+ return ResultBody.ok().data(list.size()).msg("产品充值成功");
+ } else {
+ //写入订单明细失败，则删除订单记录数据
+ Boolean e = productOrderService.removeById(list.get(0).getOrderId());
+ if (e)
+ return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
+ else
+ return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
}
- return ResultBody.ok().data(list.size()).msg("产品充值成功");
}
}
--
Gitblit v1.8.0