From a35f96d1e086655a9ee61e997520dbbe0ddc3395 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 04 Sep 2020 16:47:25 +0800
Subject: [PATCH] 修改查询科室套餐是否到期的接口,返回字段增加剩余读片量/报告量/剩余天数   删除原有的结束时间参数

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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..d631229 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,7 +104,7 @@
      */
     @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);
@@ -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());

--
Gitblit v1.8.0