From c45ba41f54c6424a20198617ff4df7433bf9e9a9 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 07 Aug 2020 18:39:59 +0800 Subject: [PATCH] 1.走查运营后台后,修改了页面所有显著错误和问题 2.修改运营后台 医院,充值,产品,套餐部分业务错误 3.增加首页数据接口 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 150 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 105 insertions(+), 45 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 103ca15..908e93b 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,12 +1,11 @@ package com.kidgrow.oprationcenter.controller; import com.kidgrow.common.annotation.LoginUser; +import com.kidgrow.common.constant.CommonConstant; 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.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; @@ -15,6 +14,7 @@ import com.kidgrow.oprationcenter.service.IProductOrderService; 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; @@ -56,7 +56,8 @@ private IBusinessRecordsService businessRecordsService; @Autowired private IProductOrderService productOrderService; - + @Autowired + private SysUserService sysUserServiceFeign; /** * 列表 */ @@ -73,6 +74,7 @@ } return productOrderDetailService.findList(params); } + /** * 列表 */ @@ -89,6 +91,7 @@ } return productOrderDetailService.all(params); } + /** * 列表 */ @@ -103,7 +106,7 @@ params.put("page", 1); params.put("limit", 10); } - if(params.get("diagnosticHospitalId")==null) + if (params.get("diagnosticHospitalId") == null) return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build(); return productOrderDetailService.findAllDataList(params); } @@ -129,6 +132,7 @@ * 获取医院套餐是否到期和到期时间 * data内 isend为true说明套餐到期 * endtime上套餐的到期时间 + * * @param hospitalId * @param departmentId * @return @@ -136,21 +140,22 @@ @ApiOperation(value = "获取医院套餐是否到期和到期时间") @GetMapping("/UserProductDetailData") - public ResultBody UserProductDetailData(@RequestParam Long hospitalId,@RequestParam Long departmentId) { - return productOrderDetailService.UserProductDetailData(hospitalId,departmentId); + public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId) { + return productOrderDetailService.UserProductDetailData(hospitalId, departmentId); } /** * 获取医院套餐是否到期和到期时间 * data内 isend为true说明套餐到期 * endtime上套餐的到期时间 + * * @return */ @ApiOperation(value = "获取医院套餐是否到期和到期时间") @PostMapping("/serviceperiod") public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) { - return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(),hospitalInfo.getDepartmentId()); + return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId()); } /** @@ -178,7 +183,7 @@ */ @ApiOperation(value = "保存") @PostMapping - public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult,@LoginUser SysUser sysUser) { + 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()) { @@ -187,8 +192,8 @@ return ResultBody.failed().msg(errMsg.toString()); } else { List<SysOrganization> organizations = sysUser.getOrganizations(); - if(organizations.size()>0){ - productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode()); + if (organizations.size() > 0) { + productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode()); } boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail); if (v) { @@ -200,12 +205,12 @@ } /** - * 新增or更新 + * 新增or更新 套餐充值 */ @ApiOperation(value = "保存") @PostMapping("/saveall") @Transactional(rollbackFor = Exception.class) - public ResultBody batchInsert(@Valid @RequestBody List<ProductOrderDetail> list, BindingResult bindingResult) { + public ResultBody batchInsert(@Valid @RequestBody List<ProductOrderDetail> list,BindingResult bindingResult) { List<String> errMsg = new ArrayList<>(); if (bindingResult.hasErrors()) { for (ObjectError error : bindingResult.getAllErrors()) { @@ -213,36 +218,91 @@ } return ResultBody.failed().msg(errMsg.toString()); } else { - //写充值套餐给用户 - 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); - if (v&&r) { - return ResultBody.ok().data(list.size()).msg("产品充值成功"); + //先检查科室试用数量是否已经超 + 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 { - //写入订单明细失败,则删除订单记录数据 - Boolean e = productOrderService.removeById(list.get(0).getOrderId()); - if (e) - return ResultBody.failed().msg("充值数据保存失败,订单已撤回!"); - else - return ResultBody.failed().msg("充值数据保存失败,订单撤回失败!"); + return ResultBody.failed().msg("充值数据关联订单不存在!"); } } } @@ -256,7 +316,7 @@ boolean v = productOrderDetailService.removeById(id); if (v) { if (!businessRecordsService.recordBusinessData("删除订单明细:" + id, id.toString())) { - //log.error(String.format("删除订单明细id为:{1}",id)); + log.error(String.format("删除订单明细id为:{1}", id)); } return ResultBody.ok().msg("删除成功"); } else { @@ -285,7 +345,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