From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 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..d75b23e 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
@@ -9,10 +9,9 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CustomerLogMapper;
import com.doumee.dao.business.CustomerMapper;
+import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.model.Customer;
-import com.doumee.dao.business.model.CustomerLog;
-import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.FreeCustomizationDTO;
import com.doumee.dao.web.reqeust.RenovationCalculatorDTO;
import com.doumee.dao.web.reqeust.TestTrimStyleDTO;
@@ -22,6 +21,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.CustomerUserService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.checkerframework.checker.units.qual.A;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,8 @@
@Autowired
private CustomerLogMapper customerLogMapper;
+ @Autowired
+ private CustomerUserMapper customerUserMapper;
@Autowired
private MemberMapper memberMapper;
@@ -191,13 +194,7 @@
if (pageWrap.getModel().getAreaCode() != null) {
queryWrapper.lambda().eq(Customer::getAreaCode, pageWrap.getModel().getAreaCode());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(Customer::getCreateDate );
return PageData.from(customerMapper.selectPage(page, queryWrapper));
}
@@ -207,11 +204,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 +242,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 +250,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())
@@ -278,7 +275,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
}
if(StringUtils.isEmpty(member.getPhone())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈巿鏉冩墜鏈哄彿");
+ member.setPhone(freeCustomizationDTO.getPhone());
+ memberMapper.updateById(member);
}
Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda()
.eq(Customer::getPhone,freeCustomizationDTO.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1"));
@@ -293,7 +291,6 @@
customer.setOpenid(member.getOpenid());
customer.setMemberId(member.getId());
customer.setName(freeCustomizationDTO.getName());
-
customer.setProName(freeCustomizationDTO.getProvinceName());
customer.setCityName(freeCustomizationDTO.getCityName());
customer.setAreaName(freeCustomizationDTO.getAreaName());
@@ -319,11 +316,36 @@
customerLog.setAreaCode(freeCustomizationDTO.getAreaCode());
customerLog.setName(freeCustomizationDTO.getName());
customerLog.setPhone(freeCustomizationDTO.getPhone());
+ customerLog.setUsernames(freeCustomizationDTO.getUsername());
+ if(org.apache.commons.lang3.StringUtils.isBlank(freeCustomizationDTO.getUsername())){
+ //濡傛灉瀵艰喘淇℃伅涓虹┖锛屾煡璇㈣瀹㈡埛宸茬粦瀹氱殑瀵艰喘淇℃伅锛屼紶閫掔粰CRM浣跨敤
+ List<CustomerUser> userList = customerUserMapper.selectJoinList(CustomerUser.class,
+ new MPJLambdaWrapper<CustomerUser>()
+ .selectAs(Users::getIamUsername,CustomerUser::getUsername)
+ .leftJoin(Users.class, Users::getId,CustomerUser::getUserId)
+ .eq(CustomerUser::getIsdeleted,Constants.ZERO)
+ .eq(CustomerUser::getCustomerPhone,customerLog.getPhone())
+ .groupBy(Users::getIamUsername));
+ if(userList!=null && userList.size()>0){
+ String names = "";
+ for(CustomerUser cu : userList){
+ if(!names.equals("")){
+ names += ",";
+ }
+ names += cu.getUsername();
+ }
+ if(!names.equals("")){
+ customerLog.setUsernames(names);
+ }
+ }
+ }
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 +410,8 @@
customerLog.setAgeInfo(testTrimStyleDTO.getAgeInfo());
customerLog.setPhone(testTrimStyleDTO.getPhone());
customerLogMapper.insert(customerLog);
+ customerLog.setOpenid(member.getOpenid());
+ return customerLog;
}
--
Gitblit v1.9.3