From 42c4f24c54f5c0f45606befa36c5ef98d6f4ce12 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Sun, 20 Jul 2025 23:27:38 +0800
Subject: [PATCH] fix: 调整店铺名称

---
 oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java
index f3ce233..121e5a4 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreMerchantServiceImpl.java
@@ -65,6 +65,8 @@
             BeanUtil.copyProperties(request, existingStore, CopyOptions.create().setIgnoreNullValue(true));
             storeService.update(existingStore, true);
         } else if (AuditStatusEnum.APPROVED.equals(existingStatus)) {
+            Store originalStore = new Store();
+            BeanUtil.copyProperties(existingStore, originalStore, CopyOptions.create().setIgnoreNullValue(true));
             Store newStore = new Store();
             newStore.setQualifications(ListUtil.of());
             BeanUtil.copyProperties(request, newStore, CopyOptions.create().setIgnoreNullValue(true));
@@ -95,6 +97,7 @@
             StoreRevisionRecord revisionRecord = new StoreRevisionRecord();
             BeanUtil.copyProperties(request, revisionRecord, CopyOptions.create().setIgnoreNullValue(true));
             StoreAuditData auditData = new StoreAuditData();
+            auditData.setOriginalStore(originalStore);
             auditData.setStore(newStore);
             auditData.setRevisionRecord(revisionRecord);
             this.createLatestModification(request.getStoreId(), StoreChangeTypeEnum.STORE_UPDATE, auditData);
@@ -109,7 +112,9 @@
         if (StoreStatusEnum.OPEN.equals(businessStatus) && !AuditStatusEnum.APPROVED.equals(existingStatus)) {
             throw new BadRequestException("店铺未审核");
         }
-        storeService.updateStatus(existingStore.getStoreId(), businessStatus.getValue(), existingStore.getVersion());
+        existingStore.setStatus(businessStatus.getValue());
+        existingStore.setBusinessStatus(businessStatus.getValue());
+        storeService.update(existingStore, true);
     }
 
     @Override

--
Gitblit v1.9.3