From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java | 14 ++++++++++----
1 files changed, 10 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..93a9485 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());
--
Gitblit v1.8.0