From 93cec81bc04d7722e8c82d699f434709d5dd47ce Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Fri, 18 Dec 2020 13:35:19 +0800
Subject: [PATCH] 修改模板下载
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index 19dda58..b1996c0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.controller;
import com.kidgrow.common.annotation.LoginUser;
+import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
@@ -102,7 +103,7 @@
productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
}
//默认添加的合同视为无效合同,在充值完成后,会将对应合同启用
- productOrder.setIsDel(true);
+// productOrder.setIsDel(true);
boolean v = productOrderService.saveOrUpdate(productOrder);
if (v) {
return ResultBody.ok().data(productOrder).msg("保存成功");
@@ -125,6 +126,7 @@
StringUtils.isNotBlank(params.get("departmentId").toString())&&
StringUtils.isNotBlank(params.get("hospitalName").toString())&&
StringUtils.isNotBlank(params.get("departmentName").toString())) {
+ params.put("proId", CommonConstant.REG_USER_PRODUCT_ID);
boolean isResult= productOrderService.saveProductDetail(params,sysUser);
if (isResult) {
return ResultBody.ok().data(isResult).msg("试用套餐充值成功");
@@ -190,4 +192,10 @@
}
return resultBody;
}
+ @ApiOperation(value = "获取用户套餐的使用状态")
+ @PostMapping("/getStatus")
+ public ResultBody getStatus(@RequestBody ProductOrder productOrder) {
+ return productOrderService.getStatus(productOrder);
+ }
+
}
--
Gitblit v1.8.0