From 94c99e344436019b3f6bafa16ae0783795990759 Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Sat, 29 Aug 2026 16:05:24 +0800
Subject: [PATCH] fix update customer code

---
 .../service/implement/GaoCustomerServiceImplement.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java
index a3f45e7..d070e4d 100644
--- a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java
+++ b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoCustomerServiceImplement.java
@@ -157,17 +157,18 @@ public class GaoCustomerServiceImplement extends AbstractEntityService<GaoCustom
 			logger.setContent(jackson.writeValueAsString(customer));
 			GaoCustomer dbCustomer = get(customer.getId());
 			TimiException.requiredTrue(dbCustomer.getStoreId().equals(customer.getStoreId()), "customer.storeId invalid");
-			dbCustomer.setCode(TimiJava.defaultIfEmpty(customer.getCode(), null));
+			String code = TimiJava.defaultIfEmpty(customer.getCode(), null);
 			{
-				if (!Objects.equals(dbCustomer.getCode(), customer.getCode()) && TimiJava.isNotEmpty(customer.getCode())) {
-					GaoCustomer byCode = getByCode(customer.getStoreId(), customer.getCode());
-					TimiException.requiredTrue(byCode == null || !byCode.getId().equals(dbCustomer.getId()), "该姓名客户已登记");
+				if (!Objects.equals(dbCustomer.getCode(), code) && TimiJava.isNotEmpty(code)) {
+					GaoCustomer byCode = getByCode(customer.getStoreId(), code);
+					TimiException.requiredTrue(byCode == null || byCode.getId().equals(dbCustomer.getId()), "该编码客户已登记");
 				}
 				if (!Objects.equals(dbCustomer.getName(), customer.getName())) {
 					GaoCustomer byName = getByName(customer.getStoreId(), customer.getName());
 					TimiException.requiredTrue(byName == null || !byName.getId().equals(dbCustomer.getId()), "该姓名客户已登记");
 				}
 			}
+			dbCustomer.setCode(code);
 			dbCustomer.setName(customer.getName());
 			fillPinyin(dbCustomer);
 			dbCustomer.setGender(customer.getGender());