From c06d972894b536cd96b817c922fb73f69c9d1a71 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 19:28:40 +0800
Subject: [PATCH] fix: 调整店铺与商户绑定方式
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java | 3 ---
oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java | 3 +++
oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java b/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java
index 4d21d17..b2e5dea 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/converter/StoreAssembler.java
@@ -14,10 +14,12 @@
Store store = new Store();
BeanUtil.copyProperties(request, store, CopyOptions.create().setIgnoreNullValue(true));
- store.setMerchantId(SecurityUtils.getCurrentUserId());
+ // 由前端传入，不允许修改
+ //store.setMerchantId(SecurityUtils.getCurrentUserId());
Long logoUploadFileId = request.getLogoUploadFileId();
store.setLogoImageId(logoUploadFileId);
store.setLogoImageUrl(ImageUtils.getPublicObjectUrl(logoUploadFileId));
+
Long coverUploadFileId = request.getCoverUploadFileId();
store.setCoverImageId(coverUploadFileId);
store.setCoverImageUrl(ImageUtils.getPublicObjectUrl(coverUploadFileId));
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java
index 05c2404..a99b340 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java
@@ -23,6 +23,9 @@
@ApiModelProperty(value = "店铺简称", example = "永辉超市(新纪元店)")
private String storeShortName;*/
+ @ApiModelProperty(value = "商户ID")
+ private Long merchantId;
+
@NotNull
@ApiModelProperty(value = "店铺LOGO文件ID", example = "14567785444763247876234")
private Long logoUploadFileId;
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java
index bf35cd7..de71ed4 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreUpdateRequest.java
@@ -26,9 +26,6 @@
@ApiModelProperty(value = "店铺ID")
private Long storeId;
- @ApiModelProperty(value = "商户ID")
- private Long merchantId;
-
@ApiModelProperty(value = "平台类目")
private Long platformCategoryId;
--
Gitblit v1.9.3