From 6398ac4a3b9cf7d9f36756307aa1448e1e215e0c Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Wed, 25 Nov 2020 09:12:42 +0800 Subject: [PATCH] 添加taocan 的功能,继续完善 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 387 insertions(+), 27 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 1dbd74d..cff6d71 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,34 +1,44 @@ package com.kidgrow.oprationcenter.controller; -import java.util.Map; +import com.kidgrow.common.annotation.LoginUser; +import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.controller.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import com.kidgrow.common.model.*; +import com.kidgrow.oprationcenter.model.HospitalInfo; +import com.kidgrow.oprationcenter.model.ProductOrder; +import com.kidgrow.oprationcenter.model.ProductOrderDetail; +import com.kidgrow.oprationcenter.model.ProductOrderRecord; +import com.kidgrow.oprationcenter.service.IBusinessRecordsService; +import com.kidgrow.oprationcenter.service.IProductOrderDetailService; +import com.kidgrow.oprationcenter.service.IProductOrderRecordService; +import com.kidgrow.oprationcenter.service.IProductOrderService; +import com.kidgrow.oprationcenter.vo.OrderChartVo; +import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; +import com.kidgrow.oprationcenter.vo.UserProductData; +import com.kidgrow.usercenter.feign.SysUserService; 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.ProductOrderDetail; -import com.kidgrow.oprationcenter.service.IProductOrderDetailService; -import com.kidgrow.common.model.*; - +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.*; + +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; +import java.util.*; /** * 石家庄喜高科技有限责任公司 版权所有 © 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 */ @@ -36,10 +46,17 @@ @RestController @RequestMapping("/productorderdetail") @Api(tags = "产品/明显的充值记录") -public class ProductOrderDetailController extends BaseController{ +public class ProductOrderDetailController extends BaseController { @Autowired private IProductOrderDetailService productOrderDetailService; - + @Autowired + private IProductOrderRecordService productOrderRecordService; + @Autowired + private IBusinessRecordsService businessRecordsService; + @Autowired + private IProductOrderService productOrderService; + @Autowired + private SysUserService sysUserServiceFeign; /** * 列表 */ @@ -50,11 +67,126 @@ }) @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); + } + + /** + * 列表 + */ + @ApiOperation(value = "查询列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @GetMapping("all") + public PageResult all(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + return productOrderDetailService.all(params); + } + /** + * 列表 + */ + @ApiOperation(value = "查询列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @GetMapping("alldetail") + public PageResult alldetail(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + return productOrderDetailService.departmentProductDetail(params); + } + + /** + * 列表 + */ + @ApiOperation(value = "查询列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @PostMapping("/alldata") + public PageResult findAllDataList(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + if (params.get("diagnosticHospitalId") == null) + return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build(); + return productOrderDetailService.findAllDataList(params); + } + + /** + * 列表 + */ + @ApiOperation(value = "查询列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @GetMapping("/group") + public PageResult groupList(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + return productOrderDetailService.groupList(params); + } + /** + * 查询到期列表 + */ + @ApiOperation(value = "查询到期列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @GetMapping("/productEnd") + public PageResult productEndList(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + return productOrderDetailService.productEndList(params); + } + /** + * 获取医院套餐是否到期和到期时间 + * data内 isend为true说明套餐到期 + * endtime上套餐的到期时间 + * + * @param hospitalId + * @param departmentId + * @param diagnosticId + * @return + */ + + @ApiOperation(value = "获取医院套餐是否到期和到期时间") + @GetMapping("/UserProductDetailData") + public ResultBody<UserProductData> serProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) { + return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId); + } + + /** + * 获取医院套餐是否到期和到期时间 + * data内 isend为true说明套餐到期 + * endtime上套餐的到期时间 + * + * @return + */ + + @ApiOperation(value = "获取医院套餐是否到期和到期时间") + @PostMapping("/serviceperiod") + public ResultBody<UserProductData> servicePeriod(@RequestBody HospitalInfo hospitalInfo) { + return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId()); } /** @@ -82,12 +214,127 @@ */ @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()) { - return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage()); + for (ObjectError error : bindingResult.getAllErrors()) { + errMsg.add(error.getDefaultMessage()); + } + return ResultBody.failed().msg(errMsg.toString()); } else { - productOrderDetailService.saveOrUpdate(productOrderDetail); - return ResultBody.ok().data(productOrderDetail).msg("保存成功"); + 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("保存成功"); + } 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 { + //先检查科室试用数量是否已经超 + ProductOrder productOrder = productOrderService.getById(list.get(0).getOrderId()); + if (productOrder != null) { + //是否管理人员 + boolean ismanager=false, + //是否有待审核套餐 + isenabled=false; + //如果是超管,高管,销售部门管理 则不受次数限制 + ResultBody<LoginAppUser> loginAppUserTemp=sysUserServiceFeign.getLoginAppUser(); + LoginAppUser loginAppUser=loginAppUserTemp.getData(); + if (loginAppUser != null) { + + List<SysRole> sysRoleList = loginAppUser.getRoles(); + if (sysRoleList != null && sysRoleList.size() > 0) { + for (int i = 0; i < sysRoleList.size(); i++) { + String roleName = sysRoleList.get(i).getCode(); + if (roleName.equals(CommonConstant.SYSTEM_ADMIN_ROLE_CODE) || + roleName.equals(CommonConstant.SALE_MANAGER_ROLE_CODE) || + roleName.equals(CommonConstant.PC_ADMIN_ROLE_CODE) || + roleName.equals(CommonConstant.OPRATIONMANAGER_ROLE_CODE)) { + ismanager=true; + break; + } + } + } + } + if (!ismanager) { + int counts = productOrderDetailService.getEnabledCount(productOrder.getDepartmentId()); + if (counts >= CommonConstant.MAX_FREE_COUNT) { + //超过了限定次数 将试用套餐改为禁用 待审核 + for (int i = 0; i <list.size() ; i++) { + if (list.get(i).getProType()==0) { + //试用套餐 + list.get(i).setEnabled(false); + isenabled=true; + } + } + } + } + //写充值套餐给用户 + Boolean v = productOrderDetailService.saveBatch(list); + //写充值记录 + //对象转换 + List<ProductOrderRecord> productOrderRecordList = new ArrayList<ProductOrderRecord>(); + ; + list.forEach(item -> { + ProductOrderRecord productOrderRecord = new ProductOrderRecord(); + productOrderRecord.setAilightCount(item.getAilightCount()); + productOrderRecord.setOrderId(item.getOrderId()); + productOrderRecord.setProId(item.getProId()); + productOrderRecord.setProName(item.getProName()); + productOrderRecord.setProType(item.getProType()); + productOrderRecord.setIsShare(item.getIsShare()); + productOrderRecord.setIsDel(item.getIsDel()); + productOrderRecord.setRecordCount(item.getRecordCount()); + productOrderRecord.setProBegintime(item.getProBegintime()); + productOrderRecord.setProEndtime(item.getProEndtime()); + productOrderRecord.setEnabled(item.getEnabled()); + productOrderRecordList.add(productOrderRecord); + }); + Boolean r = productOrderRecordService.saveBatch(productOrderRecordList); + //更新合同 + Boolean p = false; + if (productOrder != null) { + productOrder.setIsDel(false); + p = productOrderService.saveOrUpdate(productOrder); + } + if (v && r && p) { + if (isenabled) { + return ResultBody.ok().data(list.size()).msg("充值成功,但是试用套餐需要管理审核才可使用!"); + } + else + { + 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("充值数据保存失败,订单撤回失败!"); + } + } else { + return ResultBody.failed().msg("充值数据关联订单不存在!"); + } } } @@ -97,7 +344,120 @@ @ApiOperation(value = "删除") @DeleteMapping("/{id}") public ResultBody delete(@PathVariable Long id) { - productOrderDetailService.removeById(id); - return ResultBody.ok().msg("删除成功"); + 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 { + 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 = productOrderDetailService.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; + } + + /** + * 获取 用户的状态 为试用状态还是 启用状态 + * + * @return + */ + @ApiOperation(value = "获取 用户的状态") + @GetMapping("/getTypeByUser") + public ResultBody getTypeByUser(@LoginUser SysUser sysUser) { + return productOrderDetailService.getTypeByUser(sysUser); + } + + /** + * 统计获取数据量 + * @param datatype + * 0 试用审核量 + * 1 套餐总量 + * 2 未处理用户反馈 + * 3 未处理数据需求 + * @return + */ + @ApiOperation(value = "统计获取数据量") + @GetMapping("/oprationChart") + public ResultBody oprationChart(int datatype) { + int counts=productOrderDetailService.oprationChart(datatype); + return ResultBody.ok().data(counts).msg("数据获取成功!") ; + } + + /** + * 按指定类型统计合同数量 + * @param params + * datatype 1 按年 + * 2 按月 + * 3 按天 + * 4 按周 + * beginTime 查询时间段的开始时间 + * endTime 结束时间 + * @return + */ + @ApiOperation(value = "按指定类型统计合同数量") + @GetMapping("/productOrderChart") + public ResultBody productOrderChart(@RequestParam Map<String, Object> params) { + List<OrderChartVo> orderChartVo=productOrderDetailService.productOrderChart(params); + return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ; + } + + /** + * 统计产品的使用数量 + * @return ccount 是数量 + * units 是产品名称 + */ + @ApiOperation(value = "统计产品的使用数量") + @GetMapping("/proCountChart") + public ResultBody proCountChart() { + List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart(); + return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ; + } + + /** + * 获取软件服务周期 和 读片总量 + * + */ + @ApiOperation(value = "获取软件服务周期") + @GetMapping("/getContractBeginEndTimeAndNum") + public ResultBody getContractBeginEndTimeAndNum(@RequestParam("departmentId") Long departmentId) { + Map<String,Object> map = new HashMap<>(); + map.put("department_id",departmentId); + map.put("enabled",true); + map.put("is_del",false); + List<ProductOrder> productOrders = productOrderService.listByMap(map); + IntSummaryStatistics intSummaryStatistics = productOrders.stream().mapToInt((x) -> x.getContractNum()).summaryStatistics(); + Date minDate = productOrders.stream().map(e -> e.getContractBeginTime()).min((e1, e2) -> e1.compareTo(e2)).get(); + Date manDate = productOrders.stream().map(e -> e.getContractEndTime()).max((e1, e2) -> e1.compareTo(e2)).get(); + map = new HashMap<>(); + map.put("count",intSummaryStatistics.getSum()); + map.put("beginTime",minDate); + map.put("endTime",manDate); + return ResultBody.ok().data(map); } } -- Gitblit v1.8.0