From 04b4bddaac0a222760113899568d20b45af701f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 九月 2024 19:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 5fdc7af..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;
@@ -288,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());
@@ -314,6 +316,29 @@
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;
--
Gitblit v1.9.3