From 67ee820b88a979f547cb28dfc30e4dc475406c09 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Fri, 22 Nov 2024 13:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=98=E7=BD=91=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PsCustomController.java        |  8 ++--
 .../business/domain/bo/PsCustomInfoWebBo.java | 41 +++++++++++--------
 .../service/impl/PsCustomInfoServiceImpl.java |  4 ++
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java
index 3050cea..f797414 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java
@@ -99,9 +99,11 @@ public class PsCustomController extends BaseController {
         add.setCustomSource("官网");
         add.setCustomLevel("2");
         add.setCreateTime(new Date());
+        add.setTenantId("000000");
+
+        add.setCustomName(bo.getCustomName());
         add.setCustomMobile(bo.getCustomMobile());
         add.setServiceType(bo.getServiceType());
-        add.setTenantId("000000");
         psCustomInfoService.insertByBo(add);
 
         noticeService.sendNotice(SysNoticeBo.getGonghaiInstance());
@@ -109,8 +111,8 @@ public class PsCustomController extends BaseController {
     }
 
     @SaIgnore
-    @Log(title = "getAllServiceType", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
+//    @Log(title = "getAllServiceType", businessType = BusinessType.INSERT)
+//    @RepeatSubmit()
     @GetMapping("/getAllServiceType")
     public R<Map<String, String>> getAllDictByDictType() {
         Map<String, String> allDictByDictType = dictService.getAllDictByDictType("contract_type");
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java
index daa239e..76dd59a 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java
@@ -25,24 +25,24 @@ import java.util.List;
 @EqualsAndHashCode
 @AutoMapper(target = PsCustomInfo.class)
 public class PsCustomInfoWebBo {
-    /**
-     * 类型 1客户列表 2黑名单 3公海
-     */
-    private Integer type;
-
-    /**
-     * 客户来源
-     */
-    private String customSource;
-
-    /**
-     * 客户级别
-     */
-    private String customLevel;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    private Date createTime;
+//    /**
+//     * 类型 1客户列表 2黑名单 3公海
+//     */
+//    private Integer type;
+//
+//    /**
+//     * 客户来源
+//     */
+//    private String customSource;
+//
+//    /**
+//     * 客户级别
+//     */
+//    private String customLevel;
+//
+//
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+//    private Date createTime;
 
     /**
      * 服务类别
@@ -55,4 +55,9 @@ public class PsCustomInfoWebBo {
     @Length(max = 500)
     private String customMobile;
 
+    /**
+     * 客户姓名
+     */
+    private String customName;
+
 }
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
index 0f083d8..9800c6c 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
@@ -264,7 +264,11 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
         //客户经理就是登录用户
         add.setCustomManager(LoginHelper.getUserId());
         add.setBlack(CommonStatusEnum.N.getCode());
+
         add.setCustomStatus(CustomerStatusEnum.INIT.getCode());
+        if (bo.getType() == 3){
+            add.setCustomStatus(CustomerStatusEnum.PUBLIC.getCode());
+        }
         add.setAcceptDate(new Date());
         boolean flag = baseMapper.insert(add) > 0;
         if(CollectionUtils.isNotEmpty(bo.getPriceBos())){