feat(client): 实现商品详情页用户收藏状态展示与收藏功能迁移

LiggMax · LiggMax · commit 03de3d847cbf · 2025-11-09T18:39:56.000+08:00
- 在商品详情接口中增加用户收藏状态的返回字段
- 从 ClientProductFavoriteController 迁移商品收藏接口至 ClientUserController
- 优化文件服务图片上传逻辑，支持非JPG格式自动转换
- 调整管理员登录密码校验规则，允许6-20位字母数字组合
- 修复商品服务库存缓存后错误抛出问题
- 增加根据用户ID查询商品收藏状态的临时方案实现
diff --git a/common/src/main/java/com/ligg/common/module/vo/ProductDetailVo.java b/common/src/main/java/com/ligg/common/module/vo/ProductDetailVo.java
@@ -19,6 +19,13 @@ public class ProductDetailVo extends ProductVo {
     private String description;
     private List<ProductImageVo> detailImages;
     private List<SpecVo> specs;
+    private User user;
+
+    @Getter
+    @Setter
+    public static class User {
+        private boolean favorite;
+    }
 //    private List<Images> images;
 
 //    @Getter
diff --git a/common/src/main/java/com/ligg/common/service/UserService.java b/common/src/main/java/com/ligg/common/service/UserService.java
@@ -56,5 +56,9 @@ public interface UserService extends IService<UserEntity> {
      */
     int productFavorite(Long productId, boolean isFavorite);
 
-
+    /**
+     * 根据用户id查询商品收藏是否已存在
+     * 临时方案
+     */
+    boolean isProductFavoriteByUserId(String productId, String userId);
 }
diff --git a/common/src/main/java/com/ligg/common/service/impl/FileServiceImpl.java b/common/src/main/java/com/ligg/common/service/impl/FileServiceImpl.java
@@ -50,7 +50,7 @@ public String uploadImage(MultipartFile imageFile, String path) {
             String originalFilename = imageFile.getOriginalFilename();
 
             // 生成唯一文件名
-            String uniqueFileName = UUID.randomUUID().toString().substring(0, 8) + '-' + originalFilename;
+            String uniqueFileName = UUID.randomUUID().toString().substring(0, 8) + ".jpg";
 
             //创建目录
             String datePath = java.time.LocalDate.now().toString();
@@ -62,8 +62,13 @@ public String uploadImage(MultipartFile imageFile, String path) {
             //构建文件完整路径
             Path filePath = directoryPath.resolve(uniqueFileName);
 
-            // 保存文件
-            imageFile.transferTo(filePath);
+            // 如果是JPG格式直接保存，否则进行转换
+            if (isJpegImage(contentType, originalFilename)) {
+                imageFile.transferTo(filePath);
+            } else {
+                // 转换为JPG格式
+                convertToJpeg(imageFile, filePath);
+            }
 
             return Constant.IMAGE_RELATIVE_PATH + typePath + '/' + datePath + '/' + uniqueFileName;
         } catch (IOException e) {
@@ -97,6 +102,26 @@ public StreamingResponseBody getImageInputStream(String path, String type, Strin
         };
     }
 
+    /**
+     * 判断是否为JPEG图片
+     */
+    private boolean isJpegImage(String contentType, String filename) {
+        return "image/jpeg".equals(contentType) ||
+                (filename != null && (filename.toLowerCase().endsWith(".jpg") || filename.toLowerCase().endsWith(".jpeg")));
+    }
+
+    /**
+     * 转换图片为JPG格式
+     */
+    private void convertToJpeg(MultipartFile imageFile, Path targetPath) throws IOException {
+        try (InputStream inputStream = imageFile.getInputStream()) {
+            Thumbnails.of(inputStream)
+                    .scale(1.0) // 保持原尺寸
+                    .outputFormat("jpg")
+                    .toFile(targetPath.toFile());
+        }
+    }
+
     /**
      * 获取图片输入流
      *
diff --git a/common/src/main/java/com/ligg/common/service/impl/UserServiceImpl.java b/common/src/main/java/com/ligg/common/service/impl/UserServiceImpl.java
@@ -215,8 +215,21 @@ public int productFavorite(Long productId, boolean isFavorite) {
         }
     }
 
+    /**
+     * 根据用户id查询商品收藏是否已存在
+     * 临时方案
+     */
+    @Override
+    public boolean isProductFavoriteByUserId(String productId, String userId) {
+        return productFavoriteMapper.selectOne(new LambdaQueryWrapper<ProductFavoriteEntity>()
+                .eq(ProductFavoriteEntity::getProductId, productId)
+                .eq(ProductFavoriteEntity::getUserId, userId)) != null;
+    }
+
 
     private UserEntity getRedisUserInfo(String userId) {
         return (UserEntity) redisUtil.get(UserConstant.USER_INFO + ":" + userId);
     }
+
+
 }
diff --git a/common/src/main/java/com/ligg/common/service/impl/product/ProductServiceImpl.java b/common/src/main/java/com/ligg/common/service/impl/product/ProductServiceImpl.java
@@ -35,7 +35,6 @@ public void saveFeatured(ProductEntity product) {
             //商品库存缓存没有过期时间
             redisUtil.set(ProductConstant.STOCK_KEY_PREFIX + product.getId(), product.getStock());
         }
-        throw new RuntimeException(String.valueOf(BusinessStates.INTERNAL_SERVER_ERROR));
     }
 
     /**
diff --git a/web/api-admin/src/main/java/com/ligg/apiadmin/controller/AdminAuthController.java b/web/api-admin/src/main/java/com/ligg/apiadmin/controller/AdminAuthController.java
@@ -12,10 +12,12 @@
 import com.ligg.common.utils.Response;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -24,6 +26,7 @@
 /**
  * 账户接口
  */
+@Validated
 @Tag(name = "账户接口")
 @RestController
 @RequestMapping("/api/admin/auth")
@@ -56,7 +59,7 @@ public Response<String> register(@Schema(description = "账号") @NotNull String
      */
     @PostMapping("/login")
     public Response<String> login(@Schema(description = "邮箱") @RequestParam @NotNull @Email(message = "邮箱格式错误") String email,
-                                  @Schema(description = "密码") @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z\\d]{6,30}$", message = "密码格式错误") @RequestParam @NotNull String password) {
+                                   @Schema(description = "密码") @Pattern(regexp = "^[a-zA-Z0-9]{6,20}$", message = "密码格式错误") @RequestParam @NotNull String password) {
         UserEntity userInfo = userService.getUserInfoByEmail(email);
         if (userInfo == null || !BCryptUtil.verify(password, userInfo.getPassword())) {
             return Response.error(BusinessStates.FORBIDDEN, "账号或密码错误");
diff --git a/web/api-client/src/main/java/com/ligg/apiclient/controller/ClientProductController.java b/web/api-client/src/main/java/com/ligg/apiclient/controller/ClientProductController.java
@@ -6,12 +6,15 @@
 
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.ligg.apiclient.pojo.vo.TagVo;
+import com.ligg.common.constants.UserConstant;
 import com.ligg.common.enums.SearchSorting;
+import com.ligg.common.mapper.UserMapper;
 import com.ligg.common.module.entity.ProductEntity;
 import com.ligg.common.module.entity.ProductDetailEntity;
 import com.ligg.common.module.entity.ProductImageEntity;
 import com.ligg.common.module.vo.*;
 import com.ligg.common.module.vo.search.SearchVo;
+import com.ligg.common.service.UserService;
 import com.ligg.common.service.product.ProductCommentService;
 import com.ligg.common.service.product.ProductImageService;
 import com.ligg.common.service.product.ProductService;
@@ -20,10 +23,12 @@
 import com.ligg.common.service.SpecService;
 import com.ligg.common.utils.DiscountUtil;
 import com.ligg.common.utils.ImageUtil;
+import com.ligg.common.utils.JWTUtil;
 import com.ligg.common.utils.Response;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
@@ -33,6 +38,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -54,6 +60,9 @@ public class ClientProductController {
 
     private final ProductImageService productImageService;
 
+    private final HttpServletRequest request;
+    private final UserService userService;
+
     /**
      * 获取商品分页列表
      */
@@ -118,10 +127,23 @@ public Response<ProductDetailVo> getFeaturedDetail(@Schema(description = "商品
         List<SpecVo> specVoList = specService.getSpecDetailByProductId(productId);
         featuredDetailVo.setSpecs(specVoList);
 
+        /*
+         * 用户信息
+         * 临时方案
+         */
+        String authorization = request.getHeader("Authorization");
+        if (authorization != null) {
+            Map<String, Object> userInfo = JWTUtil.parseToken(authorization);
+            String userId = (String) userInfo.get(UserConstant.USER_ID);
+            ProductDetailVo.User user = new ProductDetailVo.User();
+            user.setFavorite(userService.isProductFavoriteByUserId(productId, userId));
+            featuredDetailVo.setUser(user);
+        }
+
         //阅览数++
         productService.lambdaUpdate()
                 .eq(ProductEntity::getId, productId)
-                .setIncrBy(ProductEntity::getViews, ThreadLocalRandom.current().nextInt(10,21))
+                .setIncrBy(ProductEntity::getViews, ThreadLocalRandom.current().nextInt(10, 21))
                 .update();
         return Response.success(BusinessStates.SUCCESS, featuredDetailVo);
     }
diff --git a/web/api-client/src/main/java/com/ligg/apiclient/controller/ClientProductFavoriteController.java b/web/api-client/src/main/java/com/ligg/apiclient/controller/ClientProductFavoriteController.java
diff --git a/web/api-client/src/main/java/com/ligg/apiclient/controller/ClientUserController.java b/web/api-client/src/main/java/com/ligg/apiclient/controller/ClientUserController.java
@@ -16,6 +16,7 @@
 import com.ligg.common.module.vo.UserInfoVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -120,4 +121,12 @@ public Response<String> recharge(@RequestBody PaymentDto payment) {
                 ? Response.error(BusinessStates.INTERNAL_SERVER_ERROR)
                 : Response.success(BusinessStates.SUCCESS);
     }
+
+    @Operation(summary = "商品收藏")
+    @PostMapping("/favorite")
+    public Response<String> productFavorite(@NotNull Long productId, @NotNull boolean isFavorite) {
+        return userService.productFavorite(productId, isFavorite) < 1
+                ? Response.error(BusinessStates.INTERNAL_SERVER_ERROR)
+                : Response.success(BusinessStates.SUCCESS);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,21 @@ public int productFavorite(Long productId, boolean isFavorite) {`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
	`218`	`+ /**`
	`219`	`+ * 根据用户id查询商品收藏是否已存在`
	`220`	`+ * 临时方案`
	`221`	`+ */`
	`222`	`+ @Override`
	`223`	`+ public boolean isProductFavoriteByUserId(String productId, String userId) {`
	`224`	`+ return productFavoriteMapper.selectOne(new LambdaQueryWrapper<ProductFavoriteEntity>()`
	`225`	`+ .eq(ProductFavoriteEntity::getProductId, productId)`
	`226`	`+ .eq(ProductFavoriteEntity::getUserId, userId)) != null;`
	`227`	`+ }`
	`228`	`+`
`218`	`229`
`219`	`230`	`private UserEntity getRedisUserInfo(String userId) {`
`220`	`231`	`return (UserEntity) redisUtil.get(UserConstant.USER_INFO + ":" + userId);`
`221`	`232`	`}`
	`233`	`+`
	`234`	`+`
`222`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public void saveFeatured(ProductEntity product) {`
`35`	`35`	`//商品库存缓存没有过期时间`
`36`	`36`	`redisUtil.set(ProductConstant.STOCK_KEY_PREFIX + product.getId(), product.getStock());`
`37`	`37`	`}`
`38`		`- throw new RuntimeException(String.valueOf(BusinessStates.INTERNAL_SERVER_ERROR));`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`/**`