From ab93f86dd274293b4a0b4de943f73fd1def9cc4a Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 13 Nov 2024 15:21:00 +0800
Subject: [PATCH] 1

---
 .../controller/admin/CustomerMainController.java   |  5 ++---
 .../module/custom/service/CustomerCarService.java  |  3 ++-
 .../service/impl/CustomerCarServiceImpl.java       | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
index 252a7cd8..24a68727 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java
@@ -81,9 +81,8 @@ public class CustomerMainController {
 
     @PostMapping("/saveCustomerAndCar")
     @Operation(summary = "保存客户及车辆信息")
-    public CommonResult<Boolean> saveCustomerAndCar(@RequestBody CustomerMainSaveReqVO saveReqVO) throws Exception {
-        customerCarService.saveCustomerAndCar(saveReqVO);
-        return success(true);
+    public CommonResult<?> saveCustomerAndCar(@RequestBody CustomerMainSaveReqVO saveReqVO) throws Exception {
+        return CommonResult.success(customerCarService.saveCustomerAndCar(saveReqVO));
     }
 
     /**
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerCarService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerCarService.java
index 75b63847..390e62b5 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerCarService.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CustomerCarService.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户车辆管理关联Service 接口
@@ -34,5 +35,5 @@ public interface CustomerCarService extends IService<CustomerCar> {
      * @param saveReqVO  CustomerMainSaveReqVO
      * @return void
      **/
-    void saveCustomerAndCar(CustomerMainSaveReqVO saveReqVO) throws Exception;
+    Map<String,String> saveCustomerAndCar(CustomerMainSaveReqVO saveReqVO) throws Exception;
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCarServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCarServiceImpl.java
index 985f6e72..bf55d2c8 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCarServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerCarServiceImpl.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.custom.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.custom.entity.CarMain;
 import cn.iocoder.yudao.module.custom.entity.CustomerCar;
 import cn.iocoder.yudao.module.custom.entity.CustomerMain;
@@ -23,7 +25,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.common.BaseConstants.*;
 import static cn.iocoder.yudao.framework.common.config.CommonStr.USER_TYPE_CUS;
@@ -93,8 +97,10 @@ public class CustomerCarServiceImpl extends ServiceImpl<CustomerCarMapper, Custo
      * @date 15:51 2024/11/12
      **/
     @Override
-    public void saveCustomerAndCar(CustomerMainSaveReqVO saveReqVO) throws Exception {
+    public Map<String,String> saveCustomerAndCar(CustomerMainSaveReqVO saveReqVO) throws Exception {
+        Map<String,String> rtnMap = new HashMap<>();
         chekData(saveReqVO);
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         saveReqVO.getCar().setLicenseNumber(saveReqVO.getCar().getLicenseNumber().toUpperCase());
         //用户信息
         AdminUserRespDTO userDTO = adminUserApi.getUserByUsername(saveReqVO.getPhoneNumber());
@@ -108,6 +114,7 @@ public class CustomerCarServiceImpl extends ServiceImpl<CustomerCarMapper, Custo
             user.setPassword(PASSWORD_DEFAULT);
             user.setMobile(saveReqVO.getPhoneNumber());
             user.setUserType(USER_TYPE_CUS);
+            user.setTenantId(loginUser.getTenantId());
             //创建用户
             Long userId = adminUserApi.createUser(user);
             saveReqVO.setUserId(userId);
@@ -127,6 +134,8 @@ public class CustomerCarServiceImpl extends ServiceImpl<CustomerCarMapper, Custo
             //默认车主
             customerCar.setIsOwner("1");
             this.save(customerCar);
+            rtnMap.put("userId",userId.toString());
+            rtnMap.put("carId",carMain.getId());
         } else {
             //已有 用户
             Long userId = userDTO.getId();
@@ -155,7 +164,10 @@ public class CustomerCarServiceImpl extends ServiceImpl<CustomerCarMapper, Custo
                 customerCar.setIsOwner("1");
                 this.save(customerCar);
             }
+            rtnMap.put("userId",userId.toString());
+            rtnMap.put("carId",carMain.getId());
         }
+        return rtnMap;
     }
 
     private void chekData(CustomerMainSaveReqVO saveReqVO) throws Exception {