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 | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 44 insertions(+), 8 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 4c2a3ed..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 @@ -7,8 +7,10 @@ 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; @@ -25,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.*; /** @@ -46,6 +46,8 @@ public class ProductOrderDetailController extends BaseController { @Autowired private IProductOrderDetailService productOrderDetailService; + @Autowired + private IProductOrderRecordService productOrderRecordService; @Autowired private IBusinessRecordsService businessRecordsService; @Autowired @@ -67,7 +69,6 @@ } return productOrderDetailService.findList(params); } - /** * 列表 */ @@ -76,13 +77,13 @@ @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,@LoginUser SysUser sysUser) { + @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,sysUser); + return productOrderDetailService.all(params); } /** * 列表 @@ -118,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); } /** @@ -180,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 { //写入订单明细失败,则删除订单记录数据 -- Gitblit v1.8.0