diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java index fdcfff7..5ef56a9 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java @@ -216,6 +216,14 @@ public class PayController extends BaseController @ApiOperation(value = "0元支付", notes = "兑换码支付", httpMethod = "POST") public AjaxResult test(@RequestBody UseExchangeArg useExchangeArg) throws ParseException { Long userId = useExchangeArg.getUserId(); + AppOrder entity = new AppOrder(); + entity.setLevel(1); + entity.setUserId(userId); + entity.setPayStatus(2); + List list = appOrderMapper.selectAppOrderList(entity); + if (list != null && list.size() > 0) { + return AjaxResult.error(2001,"您已体验过7天无理由试用,不可重复试用!"); + } // 生成订单信息 AppOrder order = new AppOrder(); order.setPrice("0"); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java index 262cd73..8cb092b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.app.service.impl; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -54,6 +55,8 @@ public class AppEventsServiceImpl implements IAppEventsService List list = appEventsUserMapper.selectAppEventsUserList(appEventsUser); if (list != null && list.size() > 0) { appEvents.setIds(list.stream().map(x->x.getEventsId()).distinct().collect(Collectors.toList())); + } else { + return new ArrayList<>(); } } return appEventsMapper.selectAppEventsList(appEvents);