From a31a9fdfbdbf6582aca672846a3e27d54aba9932 Mon Sep 17 00:00:00 2001 From: lele0521 Date: Thu, 7 Mar 2024 09:22:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/event/impl/VerificationOrderExecute.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java index f12a9d846..e7a3efccf 100644 --- a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java @@ -43,7 +43,7 @@ public class VerificationOrderExecute implements OrderStatusChangeEvent { //修改虚拟订单货物可以进行售后、投诉 orderItemService.update(new LambdaUpdateWrapper().eq(OrderItem::getOrderSn, orderMessage.getOrderSn()) .set(OrderItem::getAfterSaleStatus, OrderItemAfterSaleStatusEnum.ALREADY_APPLIED) - .set(OrderItem::getCommentStatus, OrderComplaintStatusEnum.COMPLETE)); + .set(OrderItem::getComplainStatus, OrderComplaintStatusEnum.COMPLETE)); } } From f0765a6627f947f085d9d8eebbeacc2ff4b7bb6c Mon Sep 17 00:00:00 2001 From: lele0521 Date: Thu, 7 Mar 2024 11:23:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/DistributionServiceImpl.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 4d3da51cc..488f7f4f2 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java @@ -80,23 +80,25 @@ public class DistributionServiceImpl extends ServiceImpl Date: Tue, 19 Mar 2024 16:39:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20OSS=E8=B5=84=E6=BA=90=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E5=BA=97=E9=93=BA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/2024-3-19.sql | 5 +++++ .../java/cn/lili/controller/common/UploadController.java | 1 + .../src/main/java/cn/lili/modules/file/entity/File.java | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 DB/2024-3-19.sql diff --git a/DB/2024-3-19.sql b/DB/2024-3-19.sql new file mode 100644 index 000000000..6bbce5cce --- /dev/null +++ b/DB/2024-3-19.sql @@ -0,0 +1,5 @@ + +/** + 文件表增加拥有者名称 + */ +ALTER TABLE li_file ADD `owner_name` varchar(255) DEFAULT NULL COMMENT '拥有者名称'; diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 8ba540298..bd11e6244 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -105,6 +105,7 @@ public class UploadController { //如果是店铺，则记录店铺id if (authUser.getRole().equals(UserEnums.STORE)) { newFile.setOwnerId(authUser.getStoreId()); + newFile.setOwnerName(authUser.getStoreName()); } else { newFile.setOwnerId(authUser.getId()); } diff --git a/framework/src/main/java/cn/lili/modules/file/entity/File.java b/framework/src/main/java/cn/lili/modules/file/entity/File.java index 890f0bffc..437b656ca 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/File.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/File.java @@ -41,6 +41,9 @@ public class File extends BaseEntity { @ApiModelProperty(value = "拥有者id") private String ownerId; + @ApiModelProperty(value = "拥有者名称") + private String ownerName; + @ApiModelProperty(value = "用户类型") private String userEnums; From fcac4002b1dd1c97a04124384d232b2cc6cb608e Mon Sep 17 00:00:00 2001 From: lele0521 Date: Tue, 19 Mar 2024 17:03:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20OSS=E8=B5=84=E6=BA=90=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E5=BA=97=E9=93=BA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/controller/common/UploadController.java | 1 + .../java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java | 3 +++ .../java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java | 1 + 3 files changed, 5 insertions(+) diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index bd11e6244..699291e30 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -108,6 +108,7 @@ public class UploadController { newFile.setOwnerName(authUser.getStoreName()); } else { newFile.setOwnerId(authUser.getId()); + newFile.setOwnerName(authUser.getNickName()); } //存储文件目录 diff --git a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java index 291ef3501..83cffd73c 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java @@ -25,6 +25,9 @@ public class FileOwnerDTO extends PageVO { @ApiModelProperty(value = "拥有者id") private String ownerId; + @ApiModelProperty(value = "拥有者名称") + private String ownerName; + @ApiModelProperty(value = "用户类型") private String userEnums; diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index 623f9dab8..56b492b9e 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -88,6 +88,7 @@ public class FileServiceImpl extends ServiceImpl implements Fi public IPage customerPage(FileOwnerDTO fileOwnerDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getName()), File::getName, fileOwnerDTO.getName()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getOwnerName()), File::getOwnerName, fileOwnerDTO.getOwnerName()) .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()),File::getFileDirectoryId, fileOwnerDTO.getFileDirectoryId()) .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, fileOwnerDTO.getFileType()) From 1925c6d33ceefcf732e1b9649ccd2d82cb1464fb Mon Sep 17 00:00:00 2001 From: lele0521 Date: Tue, 19 Mar 2024 17:55:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20OSS=E8=B5=84=E6=BA=90=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E5=BA=97=E9=93=BA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/2024-3-19.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/DB/2024-3-19.sql b/DB/2024-3-19.sql index 6bbce5cce..ace617aca 100644 --- a/DB/2024-3-19.sql +++ b/DB/2024-3-19.sql @@ -3,3 +3,18 @@ 文件表增加拥有者名称 */ ALTER TABLE li_file ADD `owner_name` varchar(255) DEFAULT NULL COMMENT '拥有者名称'; + +/** + 初始化文件拥有者名称 + */ +UPDATE li_file f JOIN li_store s ON f.owner_id = s.id + SET f.owner_name = s.store_name +WHERE user_enums = 'STORE'; + +UPDATE li_file f JOIN li_admin_user a ON f.owner_id = a.id + SET f.owner_name = a.nick_name +WHERE user_enums = 'MANAGER'; + +UPDATE li_file f JOIN li_member m ON f.owner_id = m.id + SET f.owner_name = m.nick_name +WHERE user_enums = 'MEMBER'; \ No newline at end of file