From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 0b93508..87e3ca1 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
@@ -104,10 +104,10 @@
*/
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean saveProductDetail(Map<String,Object> params)
+ 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();
@@ -118,9 +118,9 @@
productOrder.setContractTime(new Date());
productOrder.setContractNo(RandomValueUtils.getRandom(10));
productOrder.setContractTitle(CommonConstant.REG_USER_CONTRACT_NAME);
- productOrder.setHospitalId(Long.valueOf(params.get("departmentId").toString()));
+ productOrder.setHospitalId(Long.valueOf(params.get("hospitalId").toString()));
productOrder.setHospitalName(params.get("hospitalName").toString());
- productOrder.setDepartmentId(Long.valueOf(params.get("hospitalId").toString()));
+ productOrder.setDepartmentId(Long.valueOf(params.get("departmentId").toString()));
productOrder.setDepartmentName(params.get("departmentName").toString());
productOrder.setCreateUserId(CommonConstant.CREATE_USER_ID);
productOrder.setCreateUserName(CommonConstant.CREATE_USER_NAME);
@@ -150,6 +150,9 @@
productOrderDetail.setProName(sysProduct.getProName());
productOrderDetail.setOrderId(productOrder.getId());
productOrderDetail.setProType(sysProduct.getProType());
+ productOrderDetail.setCreateUserId(CommonConstant.CREATE_USER_ID);
+ productOrderDetail.setCreateUserName(CommonConstant.CREATE_USER_NAME);
+ productOrderDetail.setIsShare(false);
if(productOrderDetailMapper.insert(productOrderDetail)==1)
{
//充值记录
@@ -159,6 +162,7 @@
productOrderRecord.setAilightCount(sysProduct.getAilightCount());
productOrderRecord.setRecordCount(sysProduct.getRecordCount());
productOrderRecord.setProBegintime(new Date());
+ productOrderRecord.setIsShare(false);
//0 天 1 月 2 年
switch(sysProduct.getProTimeUnit())
{
@@ -177,6 +181,8 @@
productOrderRecord.setProName(sysProduct.getProName());
productOrderRecord.setOrderId(productOrder.getId());
productOrderRecord.setProType(sysProduct.getProType());
+ productOrderRecord.setCreateUserId(CommonConstant.CREATE_USER_ID);
+ productOrderRecord.setCreateUserName(CommonConstant.CREATE_USER_NAME);
if(productOrderRecordMapper.insert(productOrderRecord)<1)
{
baseMapper.deleteById(productOrder.getId());
@@ -195,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