commit commit

src/main/java/com/example/afrishop_v3/controllers/LikeController.java

 package com.example.afrishop_v3.controllers;
 
 
+import com.example.afrishop_v3.base.Result;
 import com.example.afrishop_v3.models.PostLike;
 import com.example.afrishop_v3.repository.LikeRepository;
 import org.springframework.data.domain.PageRequest;
@@ -26,10 +27,10 @@ public class LikeController {
 
 
     @PostMapping(value = "/saveLike/{status}")
-    public String saveProduct(@PathVariable(value = "status") boolean status, @ModelAttribute("PostLike") PostLike like) {
+    public Result saveProduct(@PathVariable(value = "status") boolean status, @ModelAttribute("PostLike") PostLike like) {
         if (status) {
             if( !repository.existsByUserInfo_UserIdAndPost_Id(like.getUserId(),like.getPostId())) repository.save(like);
         }else repository.removeByUser_IdAndPost_Id(like.getUserId(), like.getPostId());
-        return "delete";
+        return new Result();
     }
 }

src/main/java/com/example/afrishop_v3/repository/TbCfCartRecordRRepository.java

 package com.example.afrishop_v3.repository;
 
 import com.example.afrishop_v3.models.TbCfCartRecordR;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -15,8 +17,8 @@ public interface TbCfCartRecordRRepository extends PagingAndSortingRepository<Tb
     Optional<TbCfCartRecordR> findFirstByUserIdAndItemImgAndItemSku(String userId, String itemImg, String itemSku);
 
     Optional<TbCfCartRecordR> findFirstByUserIdAndSourceItemIdAndItemSku(String userId, String sourceItemId, String itemSku);
-
-    List<TbCfCartRecordR> findAllByUserIdOrderByCreateTimeDesc(String userId);
+    @Query(value = "select a from #{#entityName} a left join TbCfStationItem x on a.itemId=x.itemId WHERE  a.userId=:userId having count(x) > 0 and x.enableFlag =1 or count(x) <=0 order by a.createTime desc")
+    List<TbCfCartRecordR> findAllByUserIdOrderByCreateTimeDesc(@Param("userId") String userId);
     List<TbCfCartRecordR> findAllByCartRecordIdIn(String[] ids);