收藏修改

zzjs-admin/src/main/java/com/miaxis/app/controller/collection/AppletCollectionInfoController.java

@@ -68,10 +68,12 @@ public class AppletCollectionInfoController extends BaseController {
     @DeleteMapping(value = "/cancelCollection/{ids}")
     @ApiOperation("取消收藏")
     public Response cancelCollection(
-            @ApiParam(name = "ids", value = "收藏ids参数", required = true)
+            @ApiParam(name = "ids", value = "商家id", required = true)
             @PathVariable Long[] ids
     ){
-        return toResponse(collectionInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+        //当前用户
+        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+        return collectionInfoService.removeCollectionByIds(userInfo.getId(),ids);
     }
 
 

zzjs-service/src/main/java/com/miaxis/collection/service/ICollectionInfoService.java

@@ -32,4 +32,11 @@ public interface ICollectionInfoService extends IService<CollectionInfo> {
      */
     Response collectionBusiness(UserInfo userInfo, Long id);
 
+    /**
+     * 取消收藏
+     * @param userId
+     * @param ids
+     * @return
+     */
+    Response removeCollectionByIds(Long userId,Long[] ids);
 }

zzjs-service/src/main/java/com/miaxis/collection/service/impl/CollectionInfoServiceImpl.java

@@ -7,12 +7,14 @@ import com.miaxis.collection.service.ICollectionInfoService;
 import com.miaxis.collection.vo.CollectionCustomerVo;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.exception.CustomException;
 import com.miaxis.customer.mapper.CustomerInfoMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -48,15 +50,46 @@ public class CollectionInfoServiceImpl extends ServiceImpl<CollectionInfoMapper,
      * @return
      */
     @Override
-    @SneakyThrows
     @Transactional(rollbackFor = Exception.class)
     public Response collectionBusiness(UserInfo userInfo, Long id) {
-        //保存收藏表
-        CollectionInfo collectionInfo = new CollectionInfo();
-        collectionInfo.setUserId(userInfo.getId());
-        collectionInfo.setCustomerId(id);
-        collectionInfoMapper.insert(collectionInfo);
-        return Response.success();
+        try{
+            List<CollectionInfo> infoList = collectionInfoMapper.selectByMap(new HashMap<String, Object>() {{
+                put("user_id", userInfo.getId());
+                put("customer_id", id);
+            }});
+            if (infoList.isEmpty()){
+                //保存收藏表
+                CollectionInfo collectionInfo = new CollectionInfo();
+                collectionInfo.setUserId(userInfo.getId());
+                collectionInfo.setCustomerId(id);
+                collectionInfoMapper.insert(collectionInfo);
+            }
+            return Response.success();
+        }catch (Exception e){
+            throw new CustomException("系统异常");
+        }
+    }
+
+    /**
+     * 取消收藏
+     * @param userId 当前用户id
+     * @param ids 商家id
+     * @return
+     */
+    @Override
+    public Response removeCollectionByIds(Long userId, Long[] ids) {
+        try{
+            for (Long id : ids) {
+                collectionInfoMapper.deleteByMap(new HashMap<String, Object>(){{
+                    put("user_id",userId);
+                    put("customer_id",id);
+                }});
+            }
+            return Response.success();
+        }catch (Exception e){
+            throw new CustomException("系统异常");
+        }
+
     }