From a730987f2a3eb600b3c0d90961aa6ac7925b902e Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Mon, 28 Sep 2020 15:49:38 +0800 Subject: [PATCH] 1.增加小数类型处理公共类 2.开通支付修改互斥条件和查询参数 3.修改单次支付的开通金额统一单位为分 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java index 811625f..84211fb 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java @@ -5,6 +5,7 @@ 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; @@ -51,8 +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 ServicePeriod(@RequestBody HospitalInfo hospitalInfo); + ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo); } -- Gitblit v1.8.0