forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java
@@ -3,7 +3,9 @@ import com.kidgrow.common.constant.ServiceNameConstants; import com.kidgrow.common.model.ResultBody; import com.kidgrow.oprationcenter.feign.fallback.ConsumptionServiceFallbackFactory; import com.kidgrow.oprationcenter.model.HospitalInfo; import com.kidgrow.oprationcenter.vo.ConsumptionRequest; import com.kidgrow.oprationcenter.vo.UserProductData; import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -50,5 +52,8 @@ * @param departmentId */ @GetMapping(value = "productorderdetail/UserProductDetailData") ResultBody UserProductDetailData (@RequestParam("hospitalId") Long hospitalId, @RequestParam("departmentId")Long departmentId); ResultBody<UserProductData> UserProductDetailData (@RequestParam("hospitalId") Long hospitalId, @RequestParam("departmentId") Long departmentId); @PostMapping("/productorderdetail/serviceperiod") ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo); } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java
@@ -2,6 +2,7 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.oprationcenter.feign.ConsumptionService; import com.kidgrow.oprationcenter.model.HospitalInfo; import com.kidgrow.oprationcenter.vo.ConsumptionRequest; import feign.hystrix.FallbackFactory; @@ -33,6 +34,11 @@ public ResultBody UserProductDetailData(Long hospitalId, Long departmentId) { return ResultBody.failed().msg("UserProductDetailData的FeignClient调用失败"); } @Override public ResultBody ServicePeriod(HospitalInfo hospitalInfo) { return ResultBody.failed().msg("getForecastHeight的FeignClient调用失败"); } }; } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java
New file @@ -0,0 +1,9 @@ package com.kidgrow.oprationcenter.model; import lombok.Data; @Data public class HospitalInfo { private Long hospitalId; private Long departmentId; } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -5,10 +5,7 @@ import com.kidgrow.common.model.SysUser; import com.kidgrow.common.service.ISuperService; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.vo.DiagnosisRecord; import com.kidgrow.oprationcenter.vo.GroupProductDetail; import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; import com.kidgrow.oprationcenter.vo.UserProductDetail; import com.kidgrow.oprationcenter.vo.*; import java.util.List; import java.util.Map; @@ -71,7 +68,7 @@ UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId); ResultBody biUserNowProduct(Long hospitalId,Long departmentId); ResultBody UserProductDetailData(Long hospitalId,Long departmentId); ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId); PageResult all(Map<String, Object> params); } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -9,7 +9,6 @@ import com.kidgrow.oprationcenter.feign.DiagnosticService; import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper; import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper; import com.kidgrow.oprationcenter.mapper.ProductOrderMapper; import com.kidgrow.oprationcenter.model.ConsumptionRecord; import com.kidgrow.oprationcenter.model.ProductOrder; import com.kidgrow.oprationcenter.model.ProductOrderDetail; @@ -76,7 +75,7 @@ * @param departmentId * @return */ public ResultBody UserProductDetailData(Long hospitalId,Long departmentId) public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId) { UserProductData userProductData=new UserProductData(); userProductData.setEnd(true); kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -6,6 +6,7 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysOrganization; import com.kidgrow.common.model.SysUser; import com.kidgrow.oprationcenter.model.HospitalInfo; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.model.ProductOrderRecord; import com.kidgrow.oprationcenter.service.IBusinessRecordsService; @@ -13,6 +14,7 @@ import com.kidgrow.oprationcenter.service.IProductOrderRecordService; import com.kidgrow.oprationcenter.service.IProductOrderService; import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; import com.kidgrow.oprationcenter.vo.UserProductData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,7 +29,9 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.*; import java.util.ArrayList; import java.util.List; import java.util.Map; /** @@ -132,11 +136,24 @@ @ApiOperation(value = "获取医院套餐是否到期和到期时间") @GetMapping("/UserProductDetailData") public ResultBody UserProductDetailData(@RequestParam("hospitalId") Long hospitalId,@RequestParam("departmentId")Long 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()); } /** * 查询 */ @ApiOperation(value = "查询")
