From 091e76cc847ec382d3a0a314bd2b2c874fb63bde Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:03:33 +0800
Subject: [PATCH] 套餐过期修改
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index 80f070e..1bef92d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.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.ProductOrder;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
@@ -51,12 +54,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser sysUser) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return productOrderService.findList(params);
+ return productOrderService.findList(params,sysUser);
}
/**
@@ -84,7 +87,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -92,6 +95,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v = productOrderService.saveOrUpdate(productOrder);
if (v) {
return ResultBody.ok().data(productOrder).msg("保存成功");
@@ -110,7 +117,7 @@
boolean v = productOrderService.removeById(id);
if (v) {
if (!businessRecordsService.recordBusinessData("删除合同:"+id,id.toString())) {
- log.error(String.format("删除合同编号为:{0}的数据后,写入业务日志失败！",id));
+ //log.error(String.format("删除合同编号为:{0}的数据后,写入业务日志失败！",id));
}
return ResultBody.ok().msg("删除成功");
@@ -140,7 +147,7 @@
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")));
+ //log.error(String.format("修改合同状态为:{0},写入业务日志失败！合同管理id为：{1}",enablad,MapUtils.getString(params,"id")));
}
}
return resultBody;
--
Gitblit v1.8.0