diff --git a/pom.xml b/pom.xml index 74aa791..3419081 100644 --- a/pom.xml +++ b/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + com.ruoyi ruoyi 3.8.9 ruoyi http://www.ruoyi.vip - 若依管理系统 - + 通告快接管理后台 + 3.8.9 UTF-8 @@ -283,4 +283,4 @@ - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java index 8e47a00..0c1e386 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java @@ -27,7 +27,7 @@ public class WxApi { @Anonymous public Map getCodeUrl(String userType, String url) { Map res = new HashMap<>(); - res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/" + url, userType)); + res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/" + url, userType)); return res; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java index 0b26f95..f39b833 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/WeChatMessageServiceImpl.java @@ -122,11 +122,11 @@ public class WeChatMessageServiceImpl implements IWeChatMessageService { String bzHtml = "https://www.ddtg.site/#/pages/mine/member/member-card?userType=02"; String jqStr = "1、进群"; String xsStr = "2、新手教程"; - String tgzStr = "3、通告主卡"; - String bzStr = "4、博主VIP"; + String tgzStr = "1、通告主卡"; + String bzStr = "2、博主VIP"; contentMessage.append(contentStr).append("\n") - .append(jqStr).append("\n") - .append(xsStr).append("\n") +// .append(jqStr).append("\n") +// .append(xsStr).append("\n") .append(tgzStr).append("\n") .append(bzStr).append("\n"); if (msgType.equals("event")) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java index f3fe8ac..69e5621 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java @@ -41,6 +41,8 @@ public class AppNoticeQuery { private String isUrgent; //是否平台结算 private String isPlatformFree; + private String cityId; + private String cityName; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 4ed565f..1f2e909 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -100,7 +100,6 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryWrapper =new LambdaQueryWrapper<>(); @@ -343,6 +339,10 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryAppListPage(AppNoticeQuery query, Page page) { + if (ObjectUtil.isNotEmpty(query.getCityId())){ + BaseCity city = cityService.getById(query.getCityId()); + query.setCityName(city.getName()); + } IPage pageList = busiNoticeMapper.queryAppListPage(query,page); List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); if(!idList.isEmpty()){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java index 8b62690..81ee32f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java @@ -5,6 +5,8 @@ import java.util.List; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.busi.domain.BusiNotice; +import com.ruoyi.busi.mapper.BusiNoticeMapper; import com.ruoyi.busi.query.AppNoticeSign; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; @@ -39,6 +41,8 @@ public class BusiNoticeSignServiceImpl extends ServiceImpl queryListPage(BusiNoticeSign pageReqVO, Page page) { @@ -57,6 +61,14 @@ public class BusiNoticeSignServiceImpl extends ServiceImpl().eq(BusiNoticeSign::getNoticeId, appNoticeSign.getNoticeId()).eq(BusiNoticeSign::getUserId, loginUser.getUserId()).last("limit 1"))!=null){ throw new Exception("请勿重复报名！"); } + //判断报名是否到上线 + BusiNotice busiNotice = noticeMapper.selectById(appNoticeSign.getNoticeId()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BusiNoticeSign::getNoticeId, appNoticeSign.getNoticeId()); + if(busiNoticeSignMapper.selectCount(queryWrapper)>=busiNotice.getNeedNum()){ + throw new Exception("报名人数已满！"); + } SysUser sysUser = userService.selectUserById(loginUser.getUserId()); int i = 0; for (JSONObject cardInfo : appNoticeSign.getCardList()) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java index ad8cefe..60fca6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCardService.java @@ -73,7 +73,7 @@ public interface IMemberCardService extends IService { * @param deplete 扣的值 **/ void dealMemberRights(Long userId,String noticeId,String rightsCode,Integer deplete) throws Exception; - + void dealMemberRights2(Long userId,String noticeId,String rightsCode,Integer deplete) throws Exception; /** * 查某用户某身份类型的会员卡到期时间，如果没有开通会员，那么返回null * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java index 465ba2b..339248d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCardServiceImpl.java @@ -290,6 +290,36 @@ public class MemberCardServiceImpl extends ServiceImpl memberCards = getMemberCards(userId,null); + if (memberCards.isEmpty()){ + throw new Exception("无正在服役的会员卡"); + } + if ("unlock_notice".equals(rightsCode)) { + if (noticeId == null){ + throw new Exception("无法识别当前通告"); + } + //true表示有浏览记录，false表示没有浏览记录；如果当前用户在足迹表中未发现该通告。 + if (footprintService.checkFoot(noticeId,userId)){ + rightsService.dealMemberRights(userId,memberCards,rightsCode,deplete); + } + } else { + rightsService.dealMemberRights(userId,memberCards,rightsCode,deplete); + } + + } /** * 查某用户某身份类型的会员卡到期时间，如果没有开通会员，那么返回null * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index ae1c3ec..42ab510 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -113,7 +113,7 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题：若依管理系统_接口文档") + .title("标题：通告快接管理后台_接口文档") // 描述 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index e4152df..e3b7eb2 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -81,6 +81,9 @@ order by dbns.create_time desc AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' ) + + AND dbn.city =#{entity.cityName} + AND ( dbn.platform_code =#{entity.platformCode} )