From b92f672511421c4f1b673242ef6ac5b186d10d1a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 09 Dec 2020 09:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java
index d631229..06ecc84 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java
@@ -56,7 +56,7 @@
@Override
public PageResult<ProductOrder> findList(Map<String, Object> params,@LoginUser SysUser sysUser){
Page<ProductOrder> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
+ Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);
params.putAll(roleOrgMap);
List<ProductOrder> list = baseMapper.findList(page, params);
return PageResult.<ProductOrder>builder().data(list).code(0).count(page.getTotal()).build();
@@ -107,7 +107,7 @@
public boolean saveProductDetail(Map<String,Object> params,SysUser sysUser)
{
//指定套餐数据
- SysProduct sysProduct=sysProductService.getById(CommonConstant.REG_USER_PRODUCT_ID);
+ SysProduct sysProduct=sysProductService.getById(Long.valueOf(params.get("proId").toString()));
if (sysProduct != null) {
//订单合同数据
ProductOrder productOrder=new ProductOrder();
@@ -201,4 +201,21 @@
}
return false;
}
+
+ /**
+ * 获取用户套餐的使用状态(正式 和 试用)
+ * 只要要有一个充值的套餐为 为正式套餐，则为正式用户；
+ * 只要有一个充值的套餐为 分享状态，则该医院的医生为正式用户
+ * @param productOrder
+ * @return
+ */
+ @Override
+ public ResultBody getStatus(ProductOrder productOrder) {
+ int status = baseMapper.getStatus(productOrder);
+ if (status>0) {
+ return ResultBody.ok().data(true);
+ }else {
+ return ResultBody.ok().data(false);
+ }
+ }
}
--
Gitblit v1.8.0