diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 8a0367d58..5b9aa2c13 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -77,6 +77,9 @@ public class WechatAppletController extends BaseController { @Autowired private ISysWxBannerImageService sysWxBannerImageService; + @Autowired + private ISysPunchThumbsupService sysPunchThumbsupService; + /** * 查询微信小程序中展示的客户案例 */ @@ -794,11 +797,39 @@ public class WechatAppletController extends BaseController { for (CommunityPunchReponse comm : list) { comm.setId(AesUtils.encrypt(comm.getId())); comm.setCusId(AesUtils.encrypt(comm.getCusId())); + comm.setThumbsupNum(comm.getThumbsupOpenid() != null ? comm.getThumbsupOpenid().size() : 0); } } return getDataTable(list); } + /** + * 打卡社区点赞 + * @return + */ + @PostMapping("/thumbsupPunch") + public AjaxResult getCommunityPunch(@RequestBody SysPunchThumbsup sysPunchThumbsup) { + if(StringUtils.isEmpty(sysPunchThumbsup.getCusOpenid(),sysPunchThumbsup.getEncPunchId()) || sysPunchThumbsup.getThumbsupFlag() == null){ + return AjaxResult.error("缺少必要参数"); + } + sysPunchThumbsup.setPunchId(Long.parseLong(AesUtils.decrypt(sysPunchThumbsup.getEncPunchId()))); + + SysPunchThumbsup existPunchThumbsup = sysPunchThumbsupService.getThumbsupByPunchIdAndOpenid(sysPunchThumbsup); + if(existPunchThumbsup != null && sysPunchThumbsup.getThumbsupFlag()){ + return AjaxResult.error("已点过暂,无法重复点赞"); + } + if(existPunchThumbsup == null && !sysPunchThumbsup.getThumbsupFlag()){ + return AjaxResult.error("还未未点赞,无法取消点赞"); + } + int row = 0; + try{ + row = sysPunchThumbsup.getThumbsupFlag() ? sysPunchThumbsupService.insertSysPunchThumbsup(sysPunchThumbsup) : sysPunchThumbsupService.deleteThumbsupByPunchIdAndOpenid(sysPunchThumbsup); + }catch (Exception e){ + e.printStackTrace(); + } + return toAjax(row); + } + /** * 修改健康减脂宣言 diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysPunchThumbsup.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysPunchThumbsup.java new file mode 100644 index 000000000..7b1ccb17c --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysPunchThumbsup.java @@ -0,0 +1,36 @@ +package com.stdiet.custom.domain; + +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 打卡社区点赞记录对象 sys_punch_thumbsup + * + * @author xzj + * @date 2021-07-15 + */ +@Data +public class SysPunchThumbsup extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 打卡记录ID */ + @Excel(name = "打卡记录ID") + private Long punchId; + + private String encPunchId; + + /** 客户微信openid */ + @Excel(name = "客户微信openid") + private String cusOpenid; + + /** 删除标识 0未删除 1已删除 */ + private Integer delFlag; + + //操作标识 true点赞 false取消点赞 + private Boolean thumbsupFlag; +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java index 278771dc3..1853d7f0c 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java @@ -67,4 +67,9 @@ public class CommunityPunchReponse { * 近期打卡体重信息 logTime: 打卡日期 weight: 体重 */ private List> recentWeight; + + /** + * 点赞的openid + */ + private List> thumbsupOpenid; } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysPunchThumbsupMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysPunchThumbsupMapper.java new file mode 100644 index 000000000..b934b8bc2 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysPunchThumbsupMapper.java @@ -0,0 +1,74 @@ +package com.stdiet.custom.mapper; + +import java.util.List; +import com.stdiet.custom.domain.SysPunchThumbsup; + +/** + * 打卡社区点赞记录Mapper接口 + * + * @author xzj + * @date 2021-07-15 + */ +public interface SysPunchThumbsupMapper +{ + /** + * 查询打卡社区点赞记录 + * + * @param id 打卡社区点赞记录ID + * @return 打卡社区点赞记录 + */ + public SysPunchThumbsup selectSysPunchThumbsupById(Long id); + + /** + * 查询打卡社区点赞记录列表 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 打卡社区点赞记录集合 + */ + public List selectSysPunchThumbsupList(SysPunchThumbsup sysPunchThumbsup); + + /** + * 新增打卡社区点赞记录 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 结果 + */ + public int insertSysPunchThumbsup(SysPunchThumbsup sysPunchThumbsup); + + /** + * 修改打卡社区点赞记录 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 结果 + */ + public int updateSysPunchThumbsup(SysPunchThumbsup sysPunchThumbsup); + + /** + * 删除打卡社区点赞记录 + * + * @param id 打卡社区点赞记录ID + * @return 结果 + */ + public int deleteSysPunchThumbsupById(Long id); + + /** + * 批量删除打卡社区点赞记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysPunchThumbsupByIds(Long[] ids); + + /** + * 根据punchId和openid删除对应点赞记录 + * @return + */ + public int deleteThumbsupByPunchIdAndOpenid(SysPunchThumbsup sysPunchThumbsup); + + /** + * 根据punchId、openid查询点赞记录 + * @param sysPunchThumbsup + * @return + */ + SysPunchThumbsup getThumbsupByPunchIdAndOpenid(SysPunchThumbsup sysPunchThumbsup); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysPunchThumbsupService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysPunchThumbsupService.java new file mode 100644 index 000000000..c46427d23 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysPunchThumbsupService.java @@ -0,0 +1,74 @@ +package com.stdiet.custom.service; + +import java.util.List; +import com.stdiet.custom.domain.SysPunchThumbsup; + +/** + * 打卡社区点赞记录Service接口 + * + * @author xzj + * @date 2021-07-15 + */ +public interface ISysPunchThumbsupService +{ + /** + * 查询打卡社区点赞记录 + * + * @param id 打卡社区点赞记录ID + * @return 打卡社区点赞记录 + */ + public SysPunchThumbsup selectSysPunchThumbsupById(Long id); + + /** + * 查询打卡社区点赞记录列表 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 打卡社区点赞记录集合 + */ + public List selectSysPunchThumbsupList(SysPunchThumbsup sysPunchThumbsup); + + /** + * 新增打卡社区点赞记录 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 结果 + */ + public int insertSysPunchThumbsup(SysPunchThumbsup sysPunchThumbsup); + + /** + * 修改打卡社区点赞记录 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 结果 + */ + public int updateSysPunchThumbsup(SysPunchThumbsup sysPunchThumbsup); + + /** + * 批量删除打卡社区点赞记录 + * + * @param ids 需要删除的打卡社区点赞记录ID + * @return 结果 + */ + public int deleteSysPunchThumbsupByIds(Long[] ids); + + /** + * 删除打卡社区点赞记录信息 + * + * @param id 打卡社区点赞记录ID + * @return 结果 + */ + public int deleteSysPunchThumbsupById(Long id); + + /** + * 根据punchId和openid删除对应点赞记录 + * @return + */ + public int deleteThumbsupByPunchIdAndOpenid(SysPunchThumbsup sysPunchThumbsup); + + /** + * 根据punchId、openid查询点赞记录 + * @param sysPunchThumbsup + * @return + */ + SysPunchThumbsup getThumbsupByPunchIdAndOpenid(SysPunchThumbsup sysPunchThumbsup); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysPunchThumbsupServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysPunchThumbsupServiceImpl.java new file mode 100644 index 000000000..247eb3346 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysPunchThumbsupServiceImpl.java @@ -0,0 +1,115 @@ +package com.stdiet.custom.service.impl; + +import java.util.List; +import com.stdiet.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.stdiet.custom.mapper.SysPunchThumbsupMapper; +import com.stdiet.custom.domain.SysPunchThumbsup; +import com.stdiet.custom.service.ISysPunchThumbsupService; + +/** + * 打卡社区点赞记录Service业务层处理 + * + * @author xzj + * @date 2021-07-15 + */ +@Service +public class SysPunchThumbsupServiceImpl implements ISysPunchThumbsupService +{ + @Autowired + private SysPunchThumbsupMapper sysPunchThumbsupMapper; + + /** + * 查询打卡社区点赞记录 + * + * @param id 打卡社区点赞记录ID + * @return 打卡社区点赞记录 + */ + @Override + public SysPunchThumbsup selectSysPunchThumbsupById(Long id) + { + return sysPunchThumbsupMapper.selectSysPunchThumbsupById(id); + } + + /** + * 查询打卡社区点赞记录列表 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 打卡社区点赞记录 + */ + @Override + public List selectSysPunchThumbsupList(SysPunchThumbsup sysPunchThumbsup) + { + return sysPunchThumbsupMapper.selectSysPunchThumbsupList(sysPunchThumbsup); + } + + /** + * 新增打卡社区点赞记录 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 结果 + */ + @Override + public int insertSysPunchThumbsup(SysPunchThumbsup sysPunchThumbsup) + { + sysPunchThumbsup.setCreateTime(DateUtils.getNowDate()); + return sysPunchThumbsupMapper.insertSysPunchThumbsup(sysPunchThumbsup); + } + + /** + * 修改打卡社区点赞记录 + * + * @param sysPunchThumbsup 打卡社区点赞记录 + * @return 结果 + */ + @Override + public int updateSysPunchThumbsup(SysPunchThumbsup sysPunchThumbsup) + { + sysPunchThumbsup.setUpdateTime(DateUtils.getNowDate()); + return sysPunchThumbsupMapper.updateSysPunchThumbsup(sysPunchThumbsup); + } + + /** + * 批量删除打卡社区点赞记录 + * + * @param ids 需要删除的打卡社区点赞记录ID + * @return 结果 + */ + @Override + public int deleteSysPunchThumbsupByIds(Long[] ids) + { + return sysPunchThumbsupMapper.deleteSysPunchThumbsupByIds(ids); + } + + /** + * 删除打卡社区点赞记录信息 + * + * @param id 打卡社区点赞记录ID + * @return 结果 + */ + @Override + public int deleteSysPunchThumbsupById(Long id) + { + return sysPunchThumbsupMapper.deleteSysPunchThumbsupById(id); + } + + /** + * 根据punchId和openid删除对应点赞记录 + * @return + */ + @Override + public int deleteThumbsupByPunchIdAndOpenid(SysPunchThumbsup sysPunchThumbsup){ + return sysPunchThumbsupMapper.deleteThumbsupByPunchIdAndOpenid(sysPunchThumbsup); + } + + /** + * 根据punchId、openid查询点赞记录 + * @param sysPunchThumbsup + * @return + */ + @Override + public SysPunchThumbsup getThumbsupByPunchIdAndOpenid(SysPunchThumbsup sysPunchThumbsup){ + return sysPunchThumbsupMapper.getThumbsupByPunchIdAndOpenid(sysPunchThumbsup); + } +} \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysPunchThumbsupMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysPunchThumbsupMapper.xml new file mode 100644 index 000000000..c9fd4a5e9 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysPunchThumbsupMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + select id, punch_id, cus_openid, create_time, update_time, del_flag from sys_punch_thumbsup + + + + + + + + insert into sys_punch_thumbsup + + punch_id, + cus_openid, + create_time, + update_time, + del_flag, + + + #{punchId}, + #{cusOpenid}, + #{createTime}, + #{updateTime}, + #{delFlag}, + + + + + update sys_punch_thumbsup + + punch_id = #{punchId}, + cus_openid = #{cusOpenid}, + create_time = #{createTime}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + + where id = #{id} + + + + update sys_punch_thumbsup set del_flag = 1 where id = #{id} + + + + update sys_punch_thumbsup set del_flag = 1 where id in + + #{id} + + + + + update sys_punch_thumbsup set del_flag = 1 where punch_id = #{punchId} and cus_openid =#{cusOpenid} + + + + + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml index 82a1995cc..7e526d82a 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml @@ -331,6 +331,8 @@ + + @@ -341,6 +343,12 @@ order by wxlog.log_time desc + + +