From 6e0a83c55db4bae4d23a4c281946bda1d610f678 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Sat, 14 Jun 2025 12:32:31 +0800
Subject: [PATCH] 补充前次提交的遗漏内容，前次提交SHA：a6f4dd
---
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java
index 87718ea..4a9ee6e 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java
@@ -1,8 +1,10 @@
package com.oying.modules.pc.store.rest;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjUtil;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreQualification;
import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
import com.oying.modules.pc.store.service.StoreQualificationService;
@@ -12,7 +14,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -35,20 +36,18 @@
@GetMapping("/list")
@ApiOperation("查询店铺资质")
//@PreAuthorize("@el.check('customer:storeQualification:list')")
- public ResponseEntity<?> getList(@PathVariable Long storeId) {
- if (ObjUtil.isEmpty(storeId)) {
- return ResponseEntity.ok(R.success(ListUtil.empty()));
- }
+ public ResponseEntity<?> getQualificationsByStoreId(@PathVariable Long storeId) {
StoreQualificationQueryCriteria criteria = new StoreQualificationQueryCriteria();
criteria.setStoreId(storeId);
List<StoreQualification> qualificationList = storeQualificationService.queryAll(criteria);
- List<CustomerStoreQualificationView> viewList = Optional.ofNullable(qualificationList).orElse(ListUtil.empty()).stream().map(i -> {
- CustomerStoreQualificationView view = new CustomerStoreQualificationView();
- BeanUtils.copyProperties(i, view);
- view.setType(i.getQualificationType());
- view.setName(i.getQualificationName());
- view.setImageUrl("");
- return view;
+ List<CustomerStoreQualificationView> viewList = Optional.ofNullable(qualificationList).orElse(ListUtil.empty())
+ .stream().map(i -> {
+ CustomerStoreQualificationView view = new CustomerStoreQualificationView();
+ BeanUtil.copyProperties(i, view, CopyOptions.create().setIgnoreNullValue(true));
+ view.setType(i.getQualificationType());
+ view.setName(i.getQualificationName());
+ view.setImageUrl(i.getQualificationImageUrl());
+ return view;
}).collect(Collectors.toList());
return ResponseEntity.ok(R.success(viewList));
}
--
Gitblit v1.9.3