From abba1aff81da3cc9d74d75f64cbd48d25716aec3 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Mar 2021 19:19:10 +0800
Subject: [PATCH] 1、增加对于套餐中的剩余读片量、有效开始日期、结束日期的加密 2、增加扣费过程中对于剩余读片量的加密 3、为下载私有云数据库增加合同与明细的查询Feign接口 4、修改合作商数据库（影像版API）的合同与明细的查询bug
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 ee1269e..cfe1f36 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("保存成功");
@@ -119,13 +120,14 @@
*/
@ApiOperation(value = "套餐充值")
@PostMapping("/saveTemp")
- public ResultBody saveProductDetail(Map<String,Object> params)
+ public ResultBody saveProductDetail(@RequestBody Map<String,Object> params,@LoginUser SysUser sysUser)
{
if (StringUtils.isNotBlank(params.get("hospitalId").toString()) &&
StringUtils.isNotBlank(params.get("departmentId").toString())&&
StringUtils.isNotBlank(params.get("hospitalName").toString())&&
StringUtils.isNotBlank(params.get("departmentName").toString())) {
- boolean isResult= productOrderService.saveProductDetail(params);
+ 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,26 @@
}
return resultBody;
}
+ @ApiOperation(value = "获取用户套餐的使用状态")
+ @PostMapping("/getStatus")
+ public ResultBody getStatus(@RequestBody ProductOrder productOrder) {
+ return productOrderService.getStatus(productOrder);
+ }
+
+ /**
+ * 根据Map的条件获取合同列表
+ * @param params
+ * @return com.kidgrow.common.model.ResultBody
+ */
+ @ApiOperation(value = "根据Map的条件获取合同列表")
+ @PostMapping("/findProductOrderListByMap")
+ public ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params) {
+ List<ProductOrder> productOrderList = productOrderService.listByMap(params);
+ if ((productOrderList!=null) && (productOrderList.size() > 0)) {
+ return ResultBody.ok().data(productOrderList);
+ } else {
+ return ResultBody.failed();
+ }
+ }
+
}
--
Gitblit v1.8.0