From a98bb3c923b1a055703cca9049364a2fc79eefe0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 10 Aug 2020 18:23:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
index 893f8d5..dea646c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
@@ -9,6 +9,7 @@
import com.kidgrow.common.utils.StringUtils;
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;
@@ -47,6 +48,8 @@
public class ProductOrderRecordController extends BaseController {
@Autowired
private IProductOrderRecordService productOrderRecordService;
+ @Autowired
+ private IProductOrderDetailService productOrderDetailService;
@Autowired
private IBusinessRecordsService businessRecordsService;
@Autowired
@@ -127,6 +130,14 @@
}
/**
+ * 查询用户的套餐剩余量
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/biUserNowProduct")
+ public ResultBody biUserNowProduct(@RequestParam long hospitalId, Long departmentId) {
+ return productOrderDetailService.biUserNowProduct(hospitalId,departmentId);
+ }
+ /**
* 查询
*/
@ApiOperation(value = "查询")
--
Gitblit v1.8.0