From 00a3e344045f8415bfde154d20780adb425d9786 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 23 Aug 2024 14:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=96=B0=E5=A2=9E=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/scale/domain/Activity.java | 1 + .../main/java/org/dromara/scale/domain/bo/ActivityBo.java | 5 ----- .../main/java/org/dromara/scale/domain/vo/ActivityVo.java | 7 ++++++- .../java/org/dromara/scale/mapper/ActivityEnterMapper.java | 1 + .../scale/service/impl/ActivityEnterServiceImpl.java | 1 + .../scale/service/impl/ReservationOrderServiceImpl.java | 2 +- .../scale/service/impl/SysScaleOrderServiceImpl.java | 2 +- .../main/resources/mapper/scale/ActivityEnterMapper.xml | 3 +++ 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java index 6100a97..4bc6f87 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Activity.java @@ -45,6 +45,7 @@ public class Activity extends BaseEntity { * 浏览量 */ private Long viewNums; + private Long enterNums; /** * 开始时间 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java index c61a44f..42b80a5 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java @@ -47,11 +47,6 @@ public class ActivityBo extends BaseEntity { @NotNull(message = "活动封面不能为空", groups = { AddGroup.class, EditGroup.class }) private Long cover; - /** - * 浏览量 - */ - private Long viewNums; - /** * 开始时间 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java index d55a3d4..cf1a93b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ActivityVo.java @@ -14,7 +14,6 @@ import java.io.Serializable; import java.util.Date; - /** * 活动视图对象 m_activity * @@ -58,6 +57,12 @@ public class ActivityVo implements Serializable { @ExcelProperty(value = "浏览量") private Long viewNums; + /** + * 参与量 + */ + @ExcelProperty(value = "参与量") + private Long enterNums; + /** * 开始时间 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java index a6a0892..c975ac4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityEnterMapper.java @@ -12,4 +12,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface ActivityEnterMapper extends BaseMapperPlus { + int updateActivityEnterNum(Long activityId); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java index 6ebdab6..fef9bbb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityEnterServiceImpl.java @@ -97,6 +97,7 @@ public class ActivityEnterServiceImpl implements IActivityEnterService { if (flag) { bo.setId(add.getId()); } + baseMapper.updateActivityEnterNum(bo.getActivityId()); return flag; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java index c86d992..d48f1b6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java @@ -118,7 +118,7 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { orderRequest.setOutTradeNo(add.getId().toString()); int totalFee = price.multiply(new BigDecimal(100)).intValue(); orderRequest.setTotalFee(totalFee); - orderRequest.setNotifyUrl(""); + orderRequest.setNotifyUrl("https://api.ysmental.com/xxx/wx/pay/notify/order/reservation"); orderRequest.setTradeType("JSAPI"); return payService.createOrder(orderRequest); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java index 887798a..2539d16 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java @@ -118,7 +118,7 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService { orderRequest.setOutTradeNo(add.getId().toString()); int totalFee = price.multiply(new BigDecimal(100)).intValue(); orderRequest.setTotalFee(totalFee); - orderRequest.setNotifyUrl(""); + orderRequest.setNotifyUrl("https://api.ysmental.com/xxx/wx/pay/notify/order/scale"); orderRequest.setTradeType("JSAPI"); return payService.createOrder(orderRequest); diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml index 00141ef..b020f65 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityEnterMapper.xml @@ -4,4 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update m_activity set enter_nums = enter_nums +1 where id = #{activityId} +