From 6b49f4ff44cbb5a3d12cd2e22ff057b4ed6e6757 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 23 Sep 2020 09:38:38 +0800
Subject: [PATCH] 添加字段，，去掉fegin客户端
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/SaasClientPayVo.java | 14 ------
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 11 +++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/pom.xml | 10 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java | 55 +++++++++++++--------------
4 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
index 9875672..2e7263d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
@@ -103,6 +103,17 @@
*/
private Boolean type;
+ private String childName;
+ /**
+ * 孩子的出生日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
+ private Date childBirthday;
+ /**
+ * 孩子的性别
+ */
+ private Integer childSex;
+
@JsonSerialize(
using = ToStringSerializer.class
)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/SaasClientPayVo.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/SaasClientPayVo.java
index 362980b..9940180 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/SaasClientPayVo.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/SaasClientPayVo.java
@@ -1,23 +1,11 @@
package com.kidgrow.oprationcenter.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.kidgrow.oprationcenter.model.SaasClientPay;
import lombok.Data;
-
-import java.util.Date;
@Data
public class SaasClientPayVo extends SaasClientPay {
- private String childName;
- /**
- * 孩子的出生日期
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
- private Date childBirthday;
- /**
- * 孩子的性别
- */
- private Integer childSex;
+
private String price;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/pom.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/pom.xml
index 51b98ca..8efd782 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/pom.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/pom.xml
@@ -26,11 +26,11 @@
<artifactId>kidgrow-usercenter-api</artifactId>
</dependency>
<!-- 调用record-->
- <dependency>
- <groupId>com.kidgrow</groupId>
- <artifactId>kidgrow-recordcenter-api</artifactId>
- <version>1.0</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.kidgrow</groupId>-->
+<!-- <artifactId>kidgrow-recordcenter-api</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- </dependency>-->
<!-- 消息总线rabbitMQ -->
<dependency>
<groupId>org.springframework.cloud</groupId>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
index 526c75a..f182753 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
@@ -5,14 +5,12 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.service.impl.SuperServiceImpl;
-import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.mapper.SaasClientPayMapper;
import com.kidgrow.oprationcenter.model.SaasClientPay;
import com.kidgrow.oprationcenter.service.ISaasClientPayService;
import com.kidgrow.oprationcenter.vo.SaasClientPayExcel;
import com.kidgrow.oprationcenter.vo.SaasClientPayVo;
import com.kidgrow.recordcenter.feign.ChildService;
-import com.kidgrow.recordcenter.model.Child;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.model.SysDoctor;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +20,6 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -72,19 +69,19 @@
beanCopier.copy(saasClientPay,vo,null);
double v = Double.parseDouble(vo.getPayPrice().toString())/100;
vo.setPrice(v+"");
- if (StringUtils.isNotBlank(vo.getChildId())) {
- Map<String,Object> map=new HashMap<>();
- map.put("id",vo.getChildId());
- ResultBody byId = childService.findById(map);
- if(byId.getCode()==0){
- Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
- if(parse!=null){
- vo.setChildName(parse.getChildName());
- vo.setChildSex(parse.getChildSex());
- vo.setChildBirthday(parse.getChildBirthday());
- }
- }
- }
+// if (StringUtils.isNotBlank(vo.getChildId())) {
+// Map<String,Object> map=new HashMap<>();
+// map.put("id",vo.getChildId());
+// ResultBody byId = childService.findById(map);
+// if(byId.getCode()==0){
+// Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
+// if(parse!=null){
+// vo.setChildName(parse.getChildName());
+// vo.setChildSex(parse.getChildSex());
+// vo.setChildBirthday(parse.getChildBirthday());
+// }
+// }
+// }
listVo.add(vo);
}
}
@@ -128,19 +125,19 @@
vo.setPayCustom(vc);
Double vk = Double.parseDouble(saasClientPay.getPayKidgrow().toString())/100;
vo.setPayKidgrow(vk);
- if (StringUtils.isNotBlank(saasClientPay.getChildId())) {
- Map<String,Object> map=new HashMap<>();
- map.put("id",saasClientPay.getChildId());
- ResultBody byId = childService.findById(map);
- if(byId.getCode()==0){
- Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
- if(parse!=null){
- vo.setChildName(parse.getChildName());
- vo.setChildSex(parse.getChildSex());
- vo.setChildBirthday(parse.getChildBirthday());
- }
- }
- }
+// if (StringUtils.isNotBlank(saasClientPay.getChildId())) {
+// Map<String,Object> map=new HashMap<>();
+// map.put("id",saasClientPay.getChildId());
+// ResultBody byId = childService.findById(map);
+// if(byId.getCode()==0){
+// Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
+// if(parse!=null){
+// vo.setChildName(parse.getChildName());
+// vo.setChildSex(parse.getChildSex());
+// vo.setChildBirthday(parse.getChildBirthday());
+// }
+// }
+// }
listVo.add(vo);
}
}
--
Gitblit v1.8.0