From 73d5561cbf2bea50acc22f91050fcc3557d49de4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 17 Aug 2020 09:58:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 148 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 119 insertions(+), 29 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 2edf84d..ee1269e 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,45 +1,52 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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.common.utils.StringUtils;
+import com.kidgrow.oprationcenter.model.ProductOrder;
+import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
+import com.kidgrow.oprationcenter.service.IProductOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.ProductOrder;
-import com.kidgrow.oprationcenter.service.IProductOrderService;
-import com.kidgrow.common.model.*;
-
+import org.apache.commons.collections4.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.*;
+
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
* @Description: 产品的充值记录-订单
- * @Project: 用户中心
- * @CreateDate: Created in 2020-04-01 09:37:05 <br>
+ * @Project: 运营中心
+ * @CreateDate: Created in 2020-04-02 18:25:34 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@Slf4j
@RestController
-@RequestMapping("/productorder")
-@Api(tags = "产品的充值记录-订单")
-public class ProductOrderController extends BaseController{
+@RequestMapping("/contract")
+@Api(tags = "产品的充值的合同信息")
+public class ProductOrderController extends BaseController {
@Autowired
private IProductOrderService productOrderService;
-
+ @Autowired
+ private IBusinessRecordsService businessRecordsService;
/**
* 列表
*/
@@ -49,12 +56,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ 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);
}
/**
@@ -82,22 +89,105 @@
*/
@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()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
- productOrderService.saveOrUpdate(productOrder);
- return ResultBody.ok().data(productOrder).msg("保存成功");
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
+ //默认添加的合同视为无效合同,在充值完成后,会将对应合同启用
+ productOrder.setIsDel(true);
+ boolean v = productOrderService.saveOrUpdate(productOrder);
+ if (v) {
+ return ResultBody.ok().data(productOrder).msg("保存成功");
+ } else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
+ /**
+ * 冲试用套餐 用于注册医生自动充值
+ * @param params
+ * @return
+ */
+ @ApiOperation(value = "套餐充值")
+ @PostMapping("/saveTemp")
+ public ResultBody saveProductDetail(Map<String,Object> params)
+ {
+ if (StringUtils.isNotBlank(params.get("hospitalId").toString()) &&
+ StringUtils.isNotBlank(params.get("departmentId").toString())&&
+ StringUtils.isNotBlank(params.get("hospitalName").toString())&&
+ StringUtils.isNotBlank(params.get("departmentName").toString())) {
+ boolean isResult= productOrderService.saveProductDetail(params);
+ if (isResult) {
+ return ResultBody.ok().data(isResult).msg("试用套餐充值成功");
+ }
+ else
+ {
+ return ResultBody.failed().data(isResult).msg("试用套餐充值失败");
+ }
+ }
+ else
+ {
+ return ResultBody.failed().data(false).msg("充值参数有误");
+ }
+ }
/**
* 删除
*/
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
- public ResultBody delete(@PathVariable Long id) {
- productOrderService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ @Transactional(rollbackFor = {Exception.class})
+ public ResultBody delete(@PathVariable Long id,HttpServletRequest request) {
+ //先删除合同下的充值
+ int delRows= productOrderService.delProductDetail(id);
+ if (delRows==0) {
+ log.info(String.format("该订单下无套餐数据{0}！",id));
+ }
+ //再删除合同
+ boolean v = productOrderService.removeById(id);
+ if (v) {
+ if (!businessRecordsService.recordBusinessData("删除合同:"+id,id.toString())) {
+ log.error(String.format("删除合同编号为:{0}的数据后,写入业务日志失败！",id));
+
+ }
+ return ResultBody.ok().msg("删除成功");
+ } else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+
+ /**
+ * 修改状态
+ *
+ * @param params
+ * @return
+ */
+ @ApiOperation(value = "修改数据状态")
+ @GetMapping("/updateEnabled")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
+ })
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params, HttpServletRequest request) {
+ if (params.size() == 0) {
+ return ResultBody.failed().msg("参数异常！");
+ }
+ ResultBody resultBody=productOrderService.updateEnabled(params);
+ //记录业务日志
+ 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")));
+ }
+ }
+ return resultBody;
}
}
--
Gitblit v1.8.0