diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/UserCollect.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/UserCollect.java index f2adab8..a9072d7 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/UserCollect.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/UserCollect.java @@ -33,4 +33,5 @@ public class UserCollect extends BaseEntity @Excel(name = "收藏时间") private String time; + private Boolean isCollect; } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java index 0d57653..8e0c746 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/UserCollectController.java @@ -2,6 +2,8 @@ package com.bonus.zlpt.equip.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.util.BooleanUtil; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; @@ -94,7 +96,12 @@ public class UserCollectController extends BaseController @PutMapping public AjaxResult edit(@RequestBody UserCollect userCollect) { - return toAjax(userCollectService.updateUserCollect(userCollect)); + if (BooleanUtil.isTrue(userCollect.getIsCollect())) { + userCollectService.deleteUserCollectByMaId(userCollect.getMaId()); + return toAjax(userCollectService.insertUserCollect(userCollect)); + } else { + return toAjax(userCollectService.deleteUserCollectByMaId(userCollect.getMaId())); + } } /** diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UserCollectMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UserCollectMapper.java index ff4e291..a21ed30 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UserCollectMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UserCollectMapper.java @@ -62,7 +62,7 @@ public interface UserCollectMapper 主键 * @return 结果 */ - public int deleteUserCollectById(Long id); + public int deleteUserCollectByMaId(Long id); /** * 批量删除我的收藏 diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUserCollectService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUserCollectService.java index ea11ed3..b50ec26 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUserCollectService.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUserCollectService.java @@ -72,5 +72,5 @@ public interface IUserCollectService 主键 * @return 结果 */ - public int deleteUserCollectById(Long id); + public int deleteUserCollectByMaId(Long id); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UserCollectServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UserCollectServiceImpl.java index a00e804..7795ec4 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UserCollectServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UserCollectServiceImpl.java @@ -101,8 +101,8 @@ public class UserCollectServiceImpl implements IUserCollectService * @return 结果 */ @Override - public int deleteUserCollectById(Long id) + public int deleteUserCollectByMaId(Long maId) { - return userCollectMapper.deleteUserCollectById(id); + return userCollectMapper.deleteUserCollectByMaId(maId); } } diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UserCollectMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UserCollectMapper.xml index 05330af..f1db9d1 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/UserCollectMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/UserCollectMapper.xml @@ -55,8 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from ma_user_collect where id = #{id} + + delete from ma_user_collect where ma_id = #{maId}