From 0f1a0887db74631c151f2f241c3ff1ceef2656e6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 24 三月 2026 17:30:46 +0800
Subject: [PATCH] feat(sales): 优化发货和销售台账相关功能

---
 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index b7cb426..0595e0b 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.basic.service.impl;
 
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,10 +35,9 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -163,7 +164,11 @@
 
                     if (followUp != null) {
                         c.setFollowUpLevel(followUp.getFollowUpLevel());
-                        c.setFollowUpTime(followUp.getFollowUpTime());
+                        c.setFollowUpTime(
+                                Date.from(
+                                        followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
+                                )
+                        );
                     }
                 })
                 .collect(Collectors.toList());
@@ -186,6 +191,11 @@
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long tenantId = loginUser.getTenantId();
         customer.setTenantId(tenantId);
+        customer.setTaxpayerIdentificationNumber("");
+        customer.setCompanyAddress("");
+        customer.setCompanyPhone("");
+        customer.setMaintainer("");
+        customer.setMaintenanceTime(new Date());
         return customerMapper.insert(customer);
     }
 

--
Gitblit v1.9.3