From 600691b69b96818950fc7d527caa5384eaf0a07c Mon Sep 17 00:00:00 2001 From: PQZ Date: Wed, 23 Apr 2025 14:30:22 +0800 Subject: [PATCH 01/14] 1 --- ruoyi-admin/src/main/resources/application-druid.yml | 1 + ruoyi-admin/src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index b8d6562..dd7bdca 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,6 +7,7 @@ spring: # 主库数据源 master: url: jdbc:mysql://124.222.105.7:3306/dl_notice?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://82.156.161.160:3306/dl_notice?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: dl_notice password: 123456 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b96116a..41b4704 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -145,8 +145,8 @@ xss: urlPatterns: /system/*,/monitor/*,/tool/* # 微信小程序配置----dl wx-app: - appId: wxd8ef44a8268672e4 - appSecret: 30c18855ceb0ab0f9801407c998199c2 + appId: wxd96fda6510adb6d3 + appSecret: 2d3bf7172d09966bd98e1611117c2cb0 wxpay: #微信公众号appid appId: wx7d10b0fa4886a583 From 4e101697cf4f21756e8cd7b71c93504978ae419a Mon Sep 17 00:00:00 2001 From: PQZ Date: Wed, 23 Apr 2025 15:56:59 +0800 Subject: [PATCH 02/14] 1 --- .../controller/MemberBlacklistController.java | 13 +++++++++---- ruoyi-admin/src/main/resources/application.yml | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java index 9c0ca49..d253d98 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java @@ -77,12 +77,17 @@ public class MemberBlacklistController extends BaseController { /** * 新增黑名单 - */ - @PreAuthorize("@ss.hasPermi('member:blacklist:add')") + * + * @param memberBlacklist {@link MemberBlacklist} + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 15:05 2025/4/23 + **/ @Log(title = "黑名单", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/saveBlack") public AjaxResult add(@RequestBody MemberBlacklist memberBlacklist) { - return toAjax(memberBlacklistService.save(memberBlacklist)); + memberBlacklistService.save(memberBlacklist); + return success(); } /** diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 41b4704..f0cc3bb 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8099 + port: 8080 servlet: # 应用的访问路径 context-path: / From fbb22469dedc1391a84968def544713abb655706 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Thu, 24 Apr 2025 17:10:08 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=80=9A=E5=91=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java | 4 +++- ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java | 2 +- .../ruoyi/member/controller/MemberOrderController.java | 7 +++++-- .../com/ruoyi/member/service/IMemberOrderService.java | 2 +- .../ruoyi/member/service/impl/MemberOrderServiceImpl.java | 4 ++-- .../ruoyi/member/service/impl/MemberUserServiceImpl.java | 1 + ruoyi-admin/src/main/resources/application.yml | 8 ++++---- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java index feb173e..9e8ba68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -49,7 +50,7 @@ public class PayApi { */ @ApiOperation(value = "统一下单-统一接口", notes = "统一下单-统一接口") @GetMapping("/prepayment") - public PrepayWithRequestPaymentResponse transactions(String type, String orderNo) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException { + public PrepayWithRequestPaymentResponse transactions( String orderNo) { LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); queryWrapper.eq(MemberOrder::getOrderNo,orderNo).last("limit 1"); MemberOrder memberOrder = memberOrderService.getOne(queryWrapper); @@ -89,6 +90,7 @@ public class PayApi { @ApiOperation(value = "支付回调", notes = "支付回调") @PostMapping("/payNotify") + @Anonymous public Map payNotify(@RequestBody JSONObject jsonObject) throws GeneralSecurityException, IOException { String key = wechatPayConfig.getApiV3Key(); String json = jsonObject.toString(); 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 2b1134f..111a7cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java @@ -35,7 +35,7 @@ public class WxApi { @Anonymous public Map getCodeUrl(String userType) { Map res = new HashMap<>(); - res.put("codeUrl", weChatUtils.getCodeUrl("https://www.nuoyunr.com/#/pages/mine/member/member-card", userType)); + res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/pages/mine/member/member-card", userType)); return res; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java index ddc6a83..1838466 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberOrderController.java @@ -1,5 +1,6 @@ package com.ruoyi.member.controller; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; @@ -97,8 +98,10 @@ public class MemberOrderController extends BaseController { @Log(title = "订单", businessType = BusinessType.INSERT) @PostMapping("/uniSaveOrder") public AjaxResult add(@RequestBody MemberOrder memberOrder) { - memberOrderService.saveOrder(memberOrder); - return success(); + String orderNo = memberOrderService.saveOrder(memberOrder); + JSONObject res =new JSONObject(); + res.put("orderNo",orderNo); + return success(res); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java index 5a5391e..dd0700d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberOrderService.java @@ -40,5 +40,5 @@ public interface IMemberOrderService extends IService { * @date 14:02 2025/4/8 * @param memberOrder {@link MemberOrder} **/ - void saveOrder(MemberOrder memberOrder); + String saveOrder(MemberOrder memberOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java index d4d7cba..b68091c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java @@ -89,7 +89,7 @@ public class MemberOrderServiceImpl extends ServiceImpl Date: Thu, 24 Apr 2025 17:43:00 +0800 Subject: [PATCH 04/14] 1 --- .../service/impl/MemberOrderServiceImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java index d4d7cba..6ce475f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java @@ -68,17 +68,19 @@ public class MemberOrderServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag, 0).eq(MemberOrder::getOrderNo, orderNo); MemberOrder memberOrder = getOne(lambdaQueryWrapper); - /*2、处理不同类型订单*/ - if ("01".equals(memberOrder.getOrderType())) { - cardService.dealMemberCard(memberOrder.getUserId(), memberOrder.getUserType(), memberOrder.getGoodsId(), memberOrder.getGoodsCycle(), memberOrder.getId()); - } else { - couponService.dealMemberCoupon(memberOrder); + if(memberOrder.getIsPay() != 1) { + /*2、处理不同类型订单*/ + if ("01".equals(memberOrder.getOrderType())) { + cardService.dealMemberCard(memberOrder.getUserId(), memberOrder.getUserType(), memberOrder.getGoodsId(), memberOrder.getGoodsCycle(), memberOrder.getId()); + } else { + couponService.dealMemberCoupon(memberOrder); + } + /*3、处理订单表数据*/ + memberOrder.setPayTime(new Date()); + memberOrder.setIsPay(1); + memberOrder.setPayWay("02"); + updateById(memberOrder); } - /*3、处理订单表数据*/ - memberOrder.setPayTime(new Date()); - memberOrder.setIsPay(1); - memberOrder.setPayWay("02"); - updateById(memberOrder); } /** From 74ab330dd10d53712816ecde0211f0058b1bdb51 Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 24 Apr 2025 18:06:02 +0800 Subject: [PATCH 05/14] 1 --- .../service/impl/MemberRightsServiceImpl.java | 51 ++++++++++++++++--- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java index 025933b..bba8d33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -100,14 +101,21 @@ public class MemberRightsServiceImpl extends ServiceImpl rights = list(lambdaQueryWrapper); + //取出最大值 + if (!rights.isEmpty()) { + List maxRights = getRightsValueZeroOrMax(rights); + MemberRights max = maxRights.get(0); + if (!("02".equals(max.getRightsType()) && max.getRightsValue() == 0)) { + int result = max.getRemaining() - deplete; + if (result == 0) { + throw new Exception("今日次数已达上限"); + } + max.setRemaining(result); + updateById(max); } - rights.setRemaining(result); - updateById(rights); + } else { + throw new Exception("未查询到权限"); } } catch (Exception e) { throw new Exception(e.getMessage()); @@ -115,6 +123,35 @@ public class MemberRightsServiceImpl extends ServiceImpl + **/ + private List getRightsValueZeroOrMax(List rights) { + // 先找 rightsValue==0 的数据 + List zeroList = rights.stream() + .filter(r -> r.getRightsValue() == 0) + .collect(Collectors.toList()); + + if (!zeroList.isEmpty()) { + // 有 0 的返回所有 0 的数据 + return zeroList; + } + + // 没 0，再找最大值 + int max = rights.stream() + .mapToInt(MemberRights::getRightsValue) + .max() + .orElse(Integer.MIN_VALUE); + + return rights.stream() + .filter(r -> r.getRightsValue() == max) + .collect(Collectors.toList()); + } + /** * 定时任务重置剩余值 * From 064fad7914360e15db42162560da26f88c8ced9e Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Thu, 24 Apr 2025 18:33:22 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=80=9A=E5=91=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java | 4 ++-- .../com/ruoyi/member/service/IMemberUserService.java | 2 +- .../ruoyi/member/service/impl/MemberUserServiceImpl.java | 9 ++++++++- .../ruoyi/web/controller/system/SysLoginController.java | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) 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 111a7cb..4e476f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java @@ -33,9 +33,9 @@ public class WxApi { @GetMapping("/getCodeUrl") @Anonymous - public Map getCodeUrl(String userType) { + public Map getCodeUrl(String userType,String url) { Map res = new HashMap<>(); - res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/pages/mine/member/member-card", userType)); + res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/"+url, userType)); return res; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java index 12129c0..3ca7ce7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java @@ -67,7 +67,7 @@ public interface IMemberUserService extends IService { * @author vinjor-M * @date 15:55 2025/3/26 **/ - String wxLogin(String openid, String decryptResult); + String wxLogin(String openid, String decryptResult,String unionId); /** * uniApp保存会员信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java index dc2fa33..2f3e8de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java @@ -160,7 +160,7 @@ public class MemberUserServiceImpl extends ServiceImpl Date: Thu, 24 Apr 2025 18:52:12 +0800 Subject: [PATCH 07/14] 1 --- .../member/controller/MemberCouponController.java | 14 ++++++++++++++ .../ruoyi/member/service/IMemberCouponService.java | 1 + 2 files changed, 15 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCouponController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCouponController.java index 3174f02..92a1fb5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCouponController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberCouponController.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -47,6 +48,19 @@ public class MemberCouponController extends BaseController { return success(list); } + /** + * 查询当前登录用户通告券 + * @author PQZ + * @date 18:37 2025/4/24 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + @GetMapping("/getMemberCoupon") + public AjaxResult getMemberCoupon() { + //获取当前登录用户id + Long userId = SecurityUtils.getUserId(); + return success(memberCouponService.getCoupon(userId)); + } + /** * 导出用户通告券变动记录列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java index b82e638..33cc28d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java @@ -41,4 +41,5 @@ public interface IMemberCouponService extends IService { **/ Integer getCoupon(Long userId); + } From 5d03a3280718b8f5857a392fb822365e4f961248 Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 24 Apr 2025 19:00:54 +0800 Subject: [PATCH 08/14] 1 --- .../ruoyi/member/service/IMemberCouponService.java | 2 +- .../member/service/impl/MemberCouponServiceImpl.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java index 33cc28d..ffe2309 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberCouponService.java @@ -29,7 +29,7 @@ public interface IMemberCouponService extends IService { * @author PQZ * @date 15:19 2025/3/28 **/ - void saveCoupon(Long userId, String type, String noticeId, Integer couponNum); + void saveCoupon(Long userId, String type, String noticeId, Integer couponNum) throws Exception; /** * 查询剩余通告券 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCouponServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCouponServiceImpl.java index ce1a781..2195235 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCouponServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberCouponServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.member.domain.MemberCoupon; import com.ruoyi.member.domain.MemberOrder; import com.ruoyi.member.mapper.MemberCouponMapper; import com.ruoyi.member.service.IMemberCouponService; +import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,8 +36,9 @@ public class MemberCouponServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper From c537b3477d9208a9548ab961b822a557e8c16872 Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 24 Apr 2025 19:12:19 +0800 Subject: [PATCH 09/14] 1 --- .../java/com/ruoyi/member/service/IMemberCardService.java | 2 +- .../com/ruoyi/member/service/IMemberRightsService.java | 3 ++- .../ruoyi/member/service/impl/MemberCardServiceImpl.java | 4 ++-- .../ruoyi/member/service/impl/MemberRightsServiceImpl.java | 4 ++-- .../ruoyi/member/service/impl/MemberUserServiceImpl.java | 7 +++++-- .../src/main/java/com/ruoyi/member/vo/MemberUserVO.java | 2 ++ 6 files changed, 14 insertions(+), 8 deletions(-) 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 ef50ada..8ead7dd 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 @@ -60,7 +60,7 @@ public interface IMemberCardService extends IService { * @author PQZ * @date 17:27 2025/3/31 **/ - Integer getCardReport(Long userId, String userType); + Integer getCardRightsValue(Long userId, String userType,String rightsCode); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java index 56339cf..242c813 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberRightsService.java @@ -26,13 +26,14 @@ public interface IMemberRightsService extends IService { void dealRights(Long userId, String userType, List rights); /** + * 根据卡id，用户id，权益编码查询权益值 * @param userId 用户id * @param carId 卡id * @return java.lang.Integer * @author PQZ * @date 17:15 2025/3/31 **/ - Integer getReport(Long userId, String carId); + Integer getMemberRightsValue(Long userId, String carId,String rightsCode); /** * 根据用户id，卡id，权益编码，更新剩余值 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 ea0e1af..2bff09e 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 @@ -225,13 +225,13 @@ public class MemberCardServiceImpl extends ServiceImpl memberCards = getMemberCards(userId, userType); if (memberCards.isEmpty()) { return 0; } else { - return rightsService.getReport(memberCards.get(0).getUserId(), memberCards.get(0).getCardId()); + return rightsService.getMemberRightsValue(memberCards.get(0).getUserId(), memberCards.get(0).getCardId(),rightsCode); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java index bba8d33..f0cecf6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberRightsServiceImpl.java @@ -67,7 +67,7 @@ public class MemberRightsServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper .eq(MemberRights::getUserId, userId) @@ -77,7 +77,7 @@ public class MemberRightsServiceImpl extends ServiceImpl filterRights = rights.stream() - .filter(item -> "report".equals(item.getRightsCode())) + .filter(item -> rightsCode.equals(item.getRightsCode())) .collect(Collectors.toList()); return filterRights.get(0).getRemaining(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java index 2f3e8de..f01213d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java @@ -116,7 +116,7 @@ public class MemberUserServiceImpl extends ServiceImpl Date: Fri, 25 Apr 2025 09:03:34 +0800 Subject: [PATCH 10/14] 1 --- .../com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 2ab35ac..e6670ee 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 @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.busi.mapper.BusiNoticeSignMapper; import com.ruoyi.busi.domain.BusiNoticeSign; import com.ruoyi.busi.service.IBusiNoticeSignService; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -49,6 +50,7 @@ public class BusiNoticeSignServiceImpl extends ServiceImpl Date: Fri, 25 Apr 2025 09:58:34 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E9=80=9A=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/controller/BusiNoticeController.java | 3 +- .../com/ruoyi/busi/domain/BusiNotice.java | 4 ++ .../com/ruoyi/busi/domain/BusiNoticeSign.java | 11 +++-- .../ruoyi/busi/mapper/BusiNoticeMapper.java | 2 +- .../com/ruoyi/busi/query/AppNoticeQuery.java | 6 +++ .../busi/service/IBusiNoticeService.java | 2 +- .../service/impl/BusiNoticeServiceImpl.java | 19 ++++++--- .../impl/BusiNoticeSignServiceImpl.java | 2 +- .../service/impl/MemberCouponServiceImpl.java | 4 +- .../mapper/busi/BusiNoticeMapper.xml | 41 +++++++++++-------- 10 files changed, 60 insertions(+), 34 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java index 6a3c7bb..dc7b38e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java @@ -228,8 +228,7 @@ public class BusiNoticeController extends BaseController @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - Page page = new Page<>(pageNum, pageSize); - IPage list = busiNoticeService.appFootprintList(query,page); + List list = busiNoticeService.appFootprintList(query); return success(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java index f7ab68c..8748d00 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java @@ -52,6 +52,10 @@ public class BusiNotice extends DlBaseEntity private String province; /** 城市 */ private String city; + /** + * 是否急招0否1是 + */ + private String isUrgent; //是否平台结算 private Integer isPlatformFree; /** 稿费下限 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java index 32c7325..c2b9c0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java @@ -43,11 +43,10 @@ public class BusiNoticeSign extends DlBaseEntity private String nickname; /** 报名用户头像 */ - @Excel(name = "报名用户头像") + @Excel(name = "报名用户头像", cellType = Excel.ColumnType.IMAGE) private String avatar; - /** 是否超级报名 */ - @Excel(name = "是否超级报名") + private String isSuper; /** 联系方式 */ @@ -59,18 +58,18 @@ public class BusiNoticeSign extends DlBaseEntity private String addrId; /** 通告合作状态 */ - @Excel(name = "通告合作状态") + private String status; /** 稿件内容 */ private String content; /** 稿件图片 */ - @Excel(name = "稿件图片") + private String images; /** 已发布的文章链接 */ - @Excel(name = "已发布的文章链接") + private String articleRef; /** * 动态表单json diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java index 1b61570..43ec3fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java @@ -49,7 +49,7 @@ public interface BusiNoticeMapper extends BaseMapper { * @param query 查询条件 * @return com.ruoyi.common.core.domain.AjaxResult **/ - IPage appFootprintList(@Param("entity") AppNoticeQuery query, Page page); + List appFootprintList(@Param("entity") AppNoticeQuery query, @Param("num") Integer num); /** * 小程序端查询订阅通告列表 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 2aa7fb4..f3fe8ac 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 @@ -37,5 +37,11 @@ public class AppNoticeQuery { //'进行中', '已关闭' private String status; private String noticeId; + //是否急招 + private String isUrgent; + //是否平台结算 + private String isPlatformFree; + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java index aabed79..dd72b0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java @@ -79,7 +79,7 @@ public interface IBusiNoticeService extends IService * @param query 查询条件 * @return com.ruoyi.common.core.domain.AjaxResult **/ - IPage appFootprintList(AppNoticeQuery query, Page page); + List appFootprintList(AppNoticeQuery query); /** 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 88ac6c4..c0d895e 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 @@ -36,6 +36,7 @@ import com.ruoyi.member.domain.MemberApply; import com.ruoyi.member.domain.MemberUser; import com.ruoyi.member.service.IMemberApplyService; import com.ruoyi.member.service.IMemberCardService; +import com.ruoyi.member.service.IMemberCouponService; import com.ruoyi.member.service.IMemberUserService; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; @@ -83,6 +84,8 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryListPage(BusiNoticeQuery query, Page page) { @@ -216,7 +219,12 @@ public class BusiNoticeServiceImpl extends ServiceImpl appFootprintList(AppNoticeQuery query, Page page) { + public List appFootprintList(AppNoticeQuery query) { query.setUserId(SecurityUtils.getUserId()); - IPage pageList = busiNoticeMapper.appFootprintList(query,page); - List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); + Integer num = cardService.getCardRightsValue(SecurityUtils.getUserId(), "02", "history"); + List pageList = busiNoticeMapper.appFootprintList(query,num); + List idList = pageList.stream().map(BusiNotice::getId).collect(Collectors.toList()); if(!idList.isEmpty()){ //查博主类型字典 List categoryList = baseCategoryService.listByParentCode(DictConstants.BLOGGER_TYPES_KEY,null); //转map Map categoryMap = categoryList.stream().collect(Collectors.toMap(BaseCategory::getCode,BaseCategory::getTitle)); - pageList.getRecords().forEach(item->{ + pageList.forEach(item->{ //报名数量、浏览量、相关字典转换 if(null==item.getViewNum()){ item.setViewNum(0); 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 e6670ee..8b62690 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 @@ -65,7 +65,7 @@ public class BusiNoticeSignServiceImpl extends ServiceImpl and main.city = #{entity.city} and main.title like concat('%', #{entity.title}, '%') and main.platform_code = #{entity.platformCode} + and main.is_urgent = #{entity.isUrgent} + and main.is_platform_free = #{entity.isPlatformFree} and main.fee_down = ]]> #{entity.params.beginFeeDown} @@ -74,7 +76,7 @@ order by dbns.create_time desc LEFT JOIN sys_user su ON dbn.user_id = su.user_id left join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0 WHERE - dbn.del_flag = 0 + dbn.del_flag = 0 and dbn.end_date >= CURDATE() AND (dbn.approval_status = '1') AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' ) @@ -82,6 +84,8 @@ order by dbns.create_time desc AND ( dbn.platform_code =#{entity.platformCode} ) + and dbn.is_urgent = #{entity.isUrgent} + and dbn.is_platform_free = #{entity.isPlatformFree} AND ( dbn.blogger_types LIKE CONCAT('%',#{entity.bloggerType},'%') ) @@ -109,20 +113,20 @@ order by dbns.create_time desc group by dbn.id ORDER BY - - - -- 查最新的 -- - dbn.create_time DESC - - - -- 查高奖励 -- - dbn.fee_up DESC - - - -- 默认正序排列 -- - dbn.create_time DESC - - + + + -- 查最新的 -- + dbn.create_time DESC + + + -- 查高奖励 -- + dbn.fee_up DESC + + + -- 默认正序排列 -- + dbn.create_time DESC + +