From 903071a542b51251e06eb38147636067393c38b7 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 17 Aug 2020 10:55:37 +0800
Subject: [PATCH] 修改注册医院的feign
---
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java | 4 +++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 4 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java | 8 +++++++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java | 3 ++-
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
index a443a97..754b5b0 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
@@ -100,12 +100,13 @@
* @param newFilePath 上传到的文件路径
* @param fileStream 要上传的文件流
*/
+ @Override
public void fileUpLoadOss(FileInfo fileInfo, String newFilePath, InputStream fileStream) {
ossClient.putObject(fileProperties.getOss().getBucketName(), newFilePath, fileStream);
fileInfo.setUrl(fileProperties.getOss().getDomain() + newFilePath);
}
-
+ @Override
public OSSObject down(String url) {
GetObjectRequest request = new GetObjectRequest(fileProperties.getOss().getBucketName(), url);
return ossClient.getObject(request);
@@ -117,6 +118,7 @@
* @param imgType
* @return
*/
+ @Override
public String FilePath(String imgType, String folderByDate, String hospitalId, String departmentId) {
//返回的文件路径
String fileFolder = OssPathEn+"/";
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
index aedf30b..b3ba0c6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
@@ -6,6 +6,7 @@
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.Map;
@@ -24,5 +25,5 @@
* 冲试用套餐 用于注册医生自动充值
*/
@PostMapping(value = "contract/saveTemp")
- ResultBody saveProductDetail(Map<String,Object> params);
+ ResultBody saveProductDetail(@RequestBody Map<String,Object> params);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
index 5500ca0..e1498d6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
@@ -50,6 +50,6 @@
* @param params
* @return
*/
- boolean saveProductDetail(Map<String,Object> params);
+ boolean saveProductDetail(Map<String,Object> params,SysUser sysUser);
}
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..cf69373 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);
@@ -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());
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..19dda58 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
@@ -119,13 +119,13 @@
*/
@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);
+ boolean isResult= productOrderService.saveProductDetail(params,sysUser);
if (isResult) {
return ResultBody.ok().data(isResult).msg("试用套餐充值成功");
}
--
Gitblit v1.8.0