From 2a0e777c3d5d8198554bcdf50f36d54927176fae Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Thu, 23 Jul 2020 12:05:12 +0800 Subject: [PATCH] 网关修改 判断逻辑 , 数据权限修改 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 91 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 82 insertions(+), 9 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 81aad5a..77d045b 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,18 @@ 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.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.ProductOrderJoinDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -21,9 +27,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -42,6 +46,8 @@ public class ProductOrderDetailController extends BaseController { @Autowired private IProductOrderDetailService productOrderDetailService; + @Autowired + private IProductOrderRecordService productOrderRecordService; @Autowired private IBusinessRecordsService businessRecordsService; @Autowired @@ -63,7 +69,6 @@ } return productOrderDetailService.findList(params); } - /** * 列表 */ @@ -72,13 +77,31 @@ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") }) - @GetMapping("/all") - public PageResult findAllList(@RequestParam Map<String, Object> params) { + @GetMapping("all") + public PageResult all(@RequestParam Map<String, Object> params) { if (params.size() == 0) { params.put("page", 1); params.put("limit", 10); } - return productOrderDetailService.findAllList(params); + return productOrderDetailService.all(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); } /** @@ -96,6 +119,21 @@ params.put("limit", 10); } return productOrderDetailService.groupList(params); + } + + /** + * 获取医院套餐是否到期和到期时间 + * data内 isend为true说明套餐到期 + * endtime上套餐的到期时间 + * @param hospitalId + * @param departmentId + * @return + */ + + @ApiOperation(value = "获取医院套餐是否到期和到期时间") + @GetMapping("/UserProductDetailData") + public ResultBody UserProductDetailData(@RequestParam("hospitalId") Long hospitalId,@RequestParam("departmentId")Long departmentId) { + return productOrderDetailService.UserProductDetailData(hospitalId,departmentId); } /** @@ -123,7 +161,7 @@ */ @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()) { for (ObjectError error : bindingResult.getAllErrors()) { @@ -131,6 +169,10 @@ } return ResultBody.failed().msg(errMsg.toString()); } else { + 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("保存成功"); @@ -154,8 +196,28 @@ } return ResultBody.failed().msg(errMsg.toString()); } else { + //写充值套餐给用户 Boolean v = productOrderDetailService.saveBatch(list); - if (v) { + //写充值记录 + //对象转换 + 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("产品充值成功"); } else { //写入订单明细失败,则删除订单记录数据 @@ -211,4 +273,15 @@ } return resultBody; } + + /** + * 获取 用户的状态 为试用状态还是 启用状态 + * + * @return + */ + @ApiOperation(value = "获取 用户的状态") + @GetMapping("/getTypeByUser") + public ResultBody getTypeByUser(@LoginUser SysUser sysUser) { + return productOrderDetailService.getTypeByUser(sysUser); + } } -- Gitblit v1.8.0