From 9a50f2b681bb89336eed8100b2ffa36fed4e2639 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 10:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
index 2e84db3..01f0050 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -207,11 +207,8 @@
return customerMapper.selectCount(wrapper);
}
-
-
-
@Override
- public void saveRenovationCalculator(RenovationCalculatorDTO renovationCalculatorDTO){
+ public CustomerLog saveRenovationCalculator(RenovationCalculatorDTO renovationCalculatorDTO){
if(Objects.isNull(renovationCalculatorDTO)
|| Objects.isNull(renovationCalculatorDTO.getMemberId())
|| Objects.isNull(renovationCalculatorDTO.getHouseStatus())
@@ -248,6 +245,7 @@
customerLog.setIsdeleted(Constants.ZERO);
customerLog.setType(Constants.TWO);
customerLog.setCrmStatus(Constants.ZERO);
+ customerLog.setName(StringUtils.isEmpty(member.getName())?member.getNickname():member.getName());
customerLog.setPhone(customer.getPhone());
customerLog.setBudget(renovationCalculatorDTO.getBudget().multiply(new BigDecimal(10000)).toString());
customerLog.setHouseStatus(renovationCalculatorDTO.getHouseStatus());
@@ -255,11 +253,13 @@
customerLog.setHouseType(renovationCalculatorDTO.getHouseType());
customerLog.setCostomerId(customer.getId().toString());
customerLogMapper.insert(customerLog);
+ customerLog.setOpenid(member.getOpenid());
+ return customerLog;
}
@Override
- public void saveFreeCustomizationApply(FreeCustomizationDTO freeCustomizationDTO){
+ public CustomerLog saveFreeCustomizationApply(FreeCustomizationDTO freeCustomizationDTO){
if(Objects.isNull(freeCustomizationDTO)
|| Objects.isNull(freeCustomizationDTO.getMemberId())
|| StringUtils.isEmpty(freeCustomizationDTO.getName())
@@ -320,10 +320,12 @@
customerLog.setName(freeCustomizationDTO.getName());
customerLog.setPhone(freeCustomizationDTO.getPhone());
customerLogMapper.insert(customerLog);
+ customerLog.setOpenid(member.getOpenid());
+ return customerLog;
}
@Override
- public void saveTestTrimStyle(TestTrimStyleDTO testTrimStyleDTO){
+ public CustomerLog saveTestTrimStyle(TestTrimStyleDTO testTrimStyleDTO){
if(Objects.isNull(testTrimStyleDTO)
|| Objects.isNull(testTrimStyleDTO.getMemberId())
@@ -388,6 +390,8 @@
customerLog.setAgeInfo(testTrimStyleDTO.getAgeInfo());
customerLog.setPhone(testTrimStyleDTO.getPhone());
customerLogMapper.insert(customerLog);
+ customerLog.setOpenid(member.getOpenid());
+ return customerLog;
}
--
Gitblit v1.9.3