From 9003f17defc6d3b39340dd1a89776695268789b5 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Thu, 26 Jun 2025 22:25:57 +0800
Subject: [PATCH] fix: 修复平台类目图标显示问题
---
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
index 04dd21d..3a12592 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java
@@ -1,17 +1,16 @@
package com.oying.modules.pc.store.rest;
+import cn.hutool.core.util.ObjUtil;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;
import com.oying.modules.pc.product.domain.enums.ProductStatusEnum;
import com.oying.modules.pc.product.service.ProductService;
import com.oying.modules.pc.store.domain.Store;
-import com.oying.modules.pc.store.domain.StoreQualification;
-import com.oying.modules.pc.store.domain.dto.StoreCustomerDetailDto;
-import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
import com.oying.modules.pc.store.domain.dto.StoreQueryCriteria;
import com.oying.modules.pc.store.service.StoreQualificationService;
import com.oying.modules.pc.store.service.StoreQueryService;
import com.oying.modules.pc.store.service.StoreService;
+import com.oying.modules.pc.store.view.CustomerStoreView;
import com.oying.modules.pc.utils.BusinessHoursUtils;
import com.oying.utils.PageResult;
import com.oying.utils.R;
@@ -52,24 +51,27 @@
for (Store store : stores) {
store.setProducts(this.getProductsByStoreId(store.getStoreId()));
}
- return ResponseEntity.ok(R.success(stores));
+ return ResponseEntity.ok(R.success(pagedStores));
}
@GetMapping(value = "/{storeId}")
@ApiOperation("查询店铺")
- public ResponseEntity<?> getStoreDetailsById(@PathVariable("storeId") Long storeId) {
+ public ResponseEntity<?> getStoreById(@PathVariable("storeId") Long storeId) {
Store store = storeService.getById(storeId);
- //store.setQualifications(this.getQualificationsByStoreId(store.getStoreId()));
- StoreCustomerDetailDto storeDto = new StoreCustomerDetailDto();
- BeanUtils.copyProperties(store, storeDto);
- storeDto.setBusinessHours(BusinessHoursUtils.formatBusinessHours(store.getOpenTime(), store.getCloseTime()));
- return ResponseEntity.ok(R.success(storeDto));
+ CustomerStoreView view = new CustomerStoreView();
+ BeanUtils.copyProperties(store, view);
+ view.setBusinessHours(BusinessHoursUtils.formatBusinessHours(store.getOpenTime(), store.getCloseTime()));
+ return ResponseEntity.ok(R.success(view));
}
- private List<StoreQualification> getQualificationsByStoreId(Long storeId) {
- StoreQualificationQueryCriteria criteria = new StoreQualificationQueryCriteria();
- criteria.setStoreId(storeId);
- return storeQualificationService.queryAll(criteria);
+ @GetMapping(value = "/{storeId}/details")
+ @ApiOperation("查询店铺")
+ public ResponseEntity<?> getStoreDetailsById(@PathVariable("storeId") Long storeId) {
+ Store store = storeService.getById(storeId);
+ if (ObjUtil.isNotEmpty(store)) {
+ store.setQualifications(storeQualificationService.queryByStoreId(storeId));
+ }
+ return ResponseEntity.ok(R.success(store));
}
private List<Product> getProductsByStoreId(Long storeId) {
--
Gitblit v1.9.3