商家pc端-洗浴汗蒸

alien-store-platform/src/main/java/shop/alien/storeplatform/controller/StorePlatformBathFacilityServiceController.java

@@ -80,7 +80,7 @@ public class StorePlatformBathFacilityServiceController {
     @ApiOperation("新增设施")
     @ApiOperationSupport(order = 4)
     @PostMapping("/save")
-    public R<String> save(@RequestBody StorePlatformBathFacility facility) {
+    public R<StorePlatformBathFacility> save(@RequestBody StorePlatformBathFacility facility) {
         log.info("StorePlatformBathFacilityServiceController.save facility={}", facility);
         return facilityService.saveFacility(facility);
     }
@@ -88,7 +88,7 @@ public class StorePlatformBathFacilityServiceController {
     @ApiOperation("修改设施")
     @ApiOperationSupport(order = 5)
     @PostMapping("/update")
-    public R<String> update(@RequestBody StorePlatformBathFacility facility) {
+    public R<StorePlatformBathFacility> update(@RequestBody StorePlatformBathFacility facility) {
         log.info("StorePlatformBathFacilityServiceController.update facility={}", facility);
         return facilityService.updateFacility(facility);
     }
@@ -96,7 +96,7 @@ public class StorePlatformBathFacilityServiceController {
     @ApiOperation("新增或修改设施")
     @ApiOperationSupport(order = 6)
     @PostMapping("/saveOrUpdate")
-    public R<String> saveOrUpdate(@RequestBody StorePlatformBathFacility facility) {
+    public R<StorePlatformBathFacility> saveOrUpdate(@RequestBody StorePlatformBathFacility facility) {
         log.info("StorePlatformBathFacilityServiceController.saveOrUpdate facility={}", facility);
         return facilityService.saveOrUpdateFacility(facility);
     }

alien-store-platform/src/main/java/shop/alien/storeplatform/service/StorePlatformBathFacilityService.java

@@ -46,7 +46,7 @@ public interface StorePlatformBathFacilityService extends IService<StorePlatform
      * @param facility 设施信息
      * @return 操作结果
      */
-    R<String> saveFacility(StorePlatformBathFacility facility);
+    R<StorePlatformBathFacility> saveFacility(StorePlatformBathFacility facility);
 
     /**
      * 修改设施
@@ -54,7 +54,7 @@ public interface StorePlatformBathFacilityService extends IService<StorePlatform
      * @param facility 设施信息
      * @return 操作结果
      */
-    R<String> updateFacility(StorePlatformBathFacility facility);
+    R<StorePlatformBathFacility> updateFacility(StorePlatformBathFacility facility);
 
     /**
      * 新增或修改设施
@@ -62,7 +62,7 @@ public interface StorePlatformBathFacilityService extends IService<StorePlatform
      * @param facility 设施信息
      * @return 操作结果
      */
-    R<String> saveOrUpdateFacility(StorePlatformBathFacility facility);
+    R<StorePlatformBathFacility> saveOrUpdateFacility(StorePlatformBathFacility facility);
 
     /**
      * 删除设施（逻辑删除）

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StorePlatformBathFacilityServiceImpl.java

@@ -53,7 +53,14 @@ public class StorePlatformBathFacilityServiceImpl extends ServiceImpl<StorePlatf
         if (id == null) {
             throw new RuntimeException("设施ID不能为空");
         }
-        return super.getById(id);
+        StorePlatformBathFacility facility = super.getById(id);
+        List<StoreImg> imgList = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>()
+                .eq(StoreImg::getStoreId, facility.getStoreId()).eq(StoreImg::getImgType, 29).in(StoreImg::getBusinessId, facility.getId()));
+
+        if (CollectionUtil.isNotEmpty(imgList)) {
+            facility.setImgUrl(imgList.get(0).getImgUrl());
+        }
+        return facility;
     }
 
     @Override
@@ -83,7 +90,7 @@ public class StorePlatformBathFacilityServiceImpl extends ServiceImpl<StorePlatf
                         .ifPresent(img -> facility.setImgUrl(img.getImgUrl()));
             });
         }
-        return this.list(queryWrapper);
+        return list;
     }
 
     @Override
@@ -116,11 +123,11 @@ public class StorePlatformBathFacilityServiceImpl extends ServiceImpl<StorePlatf
                         .ifPresent(img -> facility.setImgUrl(img.getImgUrl()));
             });
         }
-        return this.list(queryWrapper);
+        return list;
     }
 
     @Override
-    public R<String> saveFacility(StorePlatformBathFacility facility) {
+    public R<StorePlatformBathFacility> saveFacility(StorePlatformBathFacility facility) {
         log.info("StorePlatformBathFacilityServiceImpl.saveFacility facility={}", facility);
         if (facility == null) {
             return R.fail("设施信息不能为空");
@@ -145,11 +152,11 @@ public class StorePlatformBathFacilityServiceImpl extends ServiceImpl<StorePlatf
         if (!flag) {
             return R.fail("新增设施失败");
         }
-        return R.success("新增设施成功");
+        return R.data(facility);
     }
 
     @Override
-    public R<String> updateFacility(StorePlatformBathFacility facility) {
+    public R<StorePlatformBathFacility> updateFacility(StorePlatformBathFacility facility) {
         log.info("StorePlatformBathFacilityServiceImpl.updateFacility facility={}", facility);
         if (facility == null || facility.getId() == null) {
             return R.fail("设施信息或设施ID不能为空");
@@ -171,11 +178,11 @@ public class StorePlatformBathFacilityServiceImpl extends ServiceImpl<StorePlatf
         if (!flag) {
             return R.fail("修改设施失败");
         }
-        return R.success("修改设施成功");
+        return R.data(facility);
     }
 
     @Override
-    public R<String> saveOrUpdateFacility(StorePlatformBathFacility facility) {
+    public R<StorePlatformBathFacility> saveOrUpdateFacility(StorePlatformBathFacility facility) {
         log.info("StorePlatformBathFacilityServiceImpl.saveOrUpdateFacility facility={}", facility);
         if (facility == null) {
             return R.fail("设施信息不能为空");