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 | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 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 a4a1d33..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,11 +1,15 @@
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;
+import com.kidgrow.oprationcenter.service.IProductOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -13,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +31,7 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
* @Description: 产品/明显的充值记录
* @Project: 运营中心
* @CreateDate: Created in 2020-04-02 18:25:34 <br>
@@ -36,11 +42,13 @@
@RestController
@RequestMapping("/productorderdetail")
@Api(tags = "产品/明显的充值记录")
-public class ProductOrderDetailController extends BaseController{
+public class ProductOrderDetailController extends BaseController {
@Autowired
private IProductOrderDetailService productOrderDetailService;
@Autowired
private IBusinessRecordsService businessRecordsService;
+ @Autowired
+ private IProductOrderService productOrderService;
/**
* 列表
@@ -52,9 +60,9 @@
})
@GetMapping
public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
return productOrderDetailService.findList(params);
}
@@ -68,12 +76,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping("/all")
- public PageResult findAllList(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ 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);
}
/**
@@ -86,9 +94,9 @@
})
@GetMapping("/group")
public PageResult groupList(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
return productOrderDetailService.groupList(params);
}
@@ -118,20 +126,51 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
- List<String> errMsg= new ArrayList<>();
+ 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()) {
errMsg.add(error.getDefaultMessage());
}
return ResultBody.failed().msg(errMsg.toString());
- } else {
- boolean v= productOrderDetailService.saveOrUpdate(productOrderDetail);
- if(v) {
- return ResultBody.ok().data(productOrderDetail).msg("保存成功");
+ } else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
}
- else {
+ boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
+ if (v) {
+ return ResultBody.ok().data(productOrderDetail).msg("保存成功");
+ } else {
return ResultBody.failed().msg("保存失败");
+ }
+ }
+ }
+
+ /**
+ * 新增or更新
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping("/saveall")
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBody batchInsert(@Valid @RequestBody List<ProductOrderDetail> list, BindingResult bindingResult) {
+ List<String> errMsg = new ArrayList<>();
+ if (bindingResult.hasErrors()) {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
+ 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("充值数据保存失败，订单撤回失败！");
}
}
}
@@ -142,17 +181,17 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v= productOrderDetailService.removeById(id);
- if(v) {
- if (!businessRecordsService.recordBusinessData("删除订单明细:"+id,id.toString())) {
+ boolean v = productOrderDetailService.removeById(id);
+ if (v) {
+ if (!businessRecordsService.recordBusinessData("删除订单明细:" + id, id.toString())) {
//log.error(String.format("删除订单明细id为：{1}",id));
}
return ResultBody.ok().msg("删除成功");
- }
- else {
+ } else {
return ResultBody.failed().msg("删除失败");
}
}
+
/**
* 修改状态
*
@@ -169,11 +208,11 @@
if (params.size() == 0) {
return ResultBody.failed().msg("参数异常！");
}
- ResultBody resultBody=productOrderDetailService.updateEnabled(params);
+ ResultBody resultBody = productOrderDetailService.updateEnabled(params);
//记录业务日志
- if (resultBody.getCode()==0) {
- String enablad=(MapUtils.getBoolean(params, "enabled"))?"启用":"禁用";
- if (!businessRecordsService.recordBusinessData("修改订单明细状态为:"+enablad,enablad)) {
+ if (resultBody.getCode() == 0) {
+ String enablad = (MapUtils.getBoolean(params, "enabled")) ? "启用" : "禁用";
+ if (!businessRecordsService.recordBusinessData("修改订单明细状态为:" + enablad, enablad)) {
//log.error(String.format("修改合同状态为:{0},写入业务日志失败！合同管理id为：{1}",enablad,MapUtils.getString(params,"id")));
}
}
--
Gitblit v1.8.0