diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java index 7941b6d..774956b 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java @@ -9,15 +9,15 @@ import java.time.LocalDateTime; @Data public class Activity { - private int activityId ; - private int adminId; + private Integer activityId ; + private Integer adminId; private String dept; private LocalDate startTime; private LocalDate endTime; private String activityName; private BigDecimal rechargeRatio; private LocalDateTime createTime; - private int activityFlag; + private Integer activityFlag; private String name; private Integer status; diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/RateSearchRequest.java b/demo/commons/src/main/java/com/example/commons/domain/entity/RateSearchRequest.java index ee7e318..b4cfd23 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/RateSearchRequest.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/RateSearchRequest.java @@ -6,5 +6,6 @@ import lombok.Data; public class RateSearchRequest { private Integer pageNum; private Integer pageSize; + private Rate rate; } diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java index 01ab5a8..23f8535 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java @@ -24,7 +24,14 @@ public interface ActivityMapper { "" diff --git a/demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java b/demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java index 8543766..db12e09 100644 --- a/demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java +++ b/demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java @@ -32,6 +32,7 @@ public class ActivityServiceImpl implements ActivityService { @Override public int edit(Activity activity) { + activity.setActivityFlag(0); return activityMapper.edit(activity); } diff --git a/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java b/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java index be01d09..a97b40e 100644 --- a/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java +++ b/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java @@ -24,6 +24,7 @@ public class RechargeServiceImpl implements RechargeService { @Override public int edit(Recharge recharge) throws Exception { + recharge.setFlag(0); return rechargeMapper.update(recharge); }