From bc7f43176f75898fcc107818fe599f3e44301382 Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Fri, 29 Nov 2024 08:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E7=89=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/commons/domain/entity/Activity.java | 4 ++- .../com/example/commons/domain/entity/Admin.java | 23 +++++++++++++ .../com/example/commons/domain/entity/Audit.java | 2 +- .../com/example/commons/domain/entity/Detail.java | 2 +- .../example/commons/domain/entity/Recharge.java | 3 +- .../com/example/commons/domain/entity/User.java | 2 +- .../com/example/commons/domain/vo/RechargeVo.java | 38 ++++++++++++++++++++++ .../example/commons/sevice/RechargeService.java | 5 +-- .../recharge/controller/ActivityController.java | 2 +- .../recharge/controller/RechargeController.java | 7 ++-- .../example/recharge/mapper/ActivityMapper.java | 8 +++-- .../com/example/recharge/mapper/AuditMapper.java | 4 +-- .../example/recharge/mapper/RechargeMapper.java | 20 +++++++----- .../recharge/service/ActivityServiceImpl.java | 21 ++++++++++++ .../recharge/service/RechargeServiceImpl.java | 9 ++--- 15 files changed, 121 insertions(+), 29 deletions(-) create mode 100644 demo/commons/src/main/java/com/example/commons/domain/entity/Admin.java create mode 100644 demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java 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 8cc66fc..7941b6d 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 @@ -17,7 +17,9 @@ public class Activity { private String activityName; private BigDecimal rechargeRatio; private LocalDateTime createTime; - private int flag; + private int activityFlag; + private String name; + private Integer status; } diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Admin.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Admin.java new file mode 100644 index 0000000..48a03e2 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Admin.java @@ -0,0 +1,23 @@ +package com.example.commons.domain.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@NoArgsConstructor +public class Admin { + private Integer adminId; + private String name; + private String username; + private String password; + private String permission; + private String area; + private String adminFlag; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; +} diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java index f085906..ade5b3f 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java @@ -16,7 +16,7 @@ public class Audit { private Integer refundId; private String name; private String status; - private Integer flag; + private Integer AuditFlag; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java index 41a1be5..3a6dcef 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java @@ -29,7 +29,7 @@ public class Detail { private String conmmitName; private Integer status; private String updateType; - private Integer flag; + private Integer detailFlag; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java index 64776cd..181a7f0 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Recharge.java @@ -22,7 +22,7 @@ public class Recharge { private String rechargeVoucher; private Integer adminId; private String area; - private Integer status; + private String remark; private Integer flag; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -30,4 +30,5 @@ public class Recharge { private Date createTime; private Date startDate; private Date endDate; + } diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/User.java b/demo/commons/src/main/java/com/example/commons/domain/entity/User.java index 5a4e0de..bb79db0 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/User.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/User.java @@ -19,7 +19,7 @@ public class User { private String gender; private Date birthday; private String head; - private Integer flag; + private Integer UserFlag; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java new file mode 100644 index 0000000..f2e6d60 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/vo/RechargeVo.java @@ -0,0 +1,38 @@ +package com.example.commons.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +@NoArgsConstructor +public class RechargeVo { + + private Integer rechargeId; + private String homilyId; + private Integer activityId; + private Double paidGold; + private Double freeGold; + private Double rechargeGold; + private String payWay; + private String rechargeWay; + private Date rechargeTime; + private String rechargeVoucher; + private Integer adminId; + private String area; + + private String remark; + private Integer flag; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; + private Date startDate; + private Date endDate; + private String username; + private String activityName; + private String name; + private Integer status; + private String reson; +} \ No newline at end of file diff --git a/demo/commons/src/main/java/com/example/commons/sevice/RechargeService.java b/demo/commons/src/main/java/com/example/commons/sevice/RechargeService.java index d1139f0..3aab55a 100644 --- a/demo/commons/src/main/java/com/example/commons/sevice/RechargeService.java +++ b/demo/commons/src/main/java/com/example/commons/sevice/RechargeService.java @@ -1,6 +1,7 @@ package com.example.commons.sevice; import com.example.commons.domain.entity.Recharge; +import com.example.commons.domain.vo.RechargeVo; import com.github.pagehelper.PageInfo; import java.util.List; @@ -10,6 +11,6 @@ public interface RechargeService { int edit(Recharge recharge) throws Exception; Recharge findById(int id) throws Exception; - List search(Recharge recharge) ; - PageInfo searchForPage(Integer pageNum, Integer pageSize, Recharge recharge); + List search(RechargeVo rechargeVo) ; + PageInfo searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo); } diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java b/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java index 2b8e1d8..1198c75 100644 --- a/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java +++ b/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java @@ -19,7 +19,7 @@ import java.util.Arrays; @RequiredArgsConstructor // lombok的，添加一个包含所有final属性的构造器 @Slf4j //lombok的，自动添加log的对象，用于日志打印 - +@CrossOrigin public class ActivityController { @Autowired diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java index c22f4b8..f6e70a5 100644 --- a/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java +++ b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java @@ -2,6 +2,7 @@ package com.example.recharge.controller; import com.example.commons.domain.entity.Recharge; +import com.example.commons.domain.vo.RechargeVo; import com.example.commons.domain.vo.Result; import com.example.commons.sevice.RechargeService; import lombok.RequiredArgsConstructor; @@ -41,12 +42,12 @@ public class RechargeController { return Result.success(); } @PostMapping - public Result search(Integer pageNum, Integer pageSize,@RequestBody Recharge recharge) { + public Result search(Integer pageNum, Integer pageSize,@RequestBody RechargeVo rechargeVo) { if(ObjectUtils.isEmpty(pageNum)){ - return Result.success(rechargeService.search(recharge)); + return Result.success(rechargeService.search(rechargeVo)); } else { - return Result.success(rechargeService.searchForPage(pageNum,pageSize,recharge)); + return Result.success(rechargeService.searchForPage(pageNum,pageSize,rechargeVo)); } } } 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 9da0d16..8fc2294 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 @@ -11,7 +11,7 @@ public interface ActivityMapper { //增加活动信息 @Insert({"insert into activity", - "(admin_id,dept,start_time,end_time,recharge_ratio,activity_name,flag,create_time) " , + "(admin_id,dept,start_time,end_time,recharge_ratio,activity_name,activity_flag,create_time) " , "values", "(#{adminId},#{dept},#{startTime},#{endTime},#{rechargeRatio},#{activityName},1,now())" }) @@ -30,7 +30,8 @@ public interface ActivityMapper { " end_time = #{endTime}, ", " recharge_ratio = #{rechargeRatio}, ", " activity_name = #{activityName}, ", - " `flag` = #{flag}, ", + " `activity_flag` = #{activityFlag}, ", + " `status` = #{status}, ", "", "where activity_id=#{activityId}", "" @@ -47,7 +48,8 @@ public interface ActivityMapper { //模糊查询--根据活动id查询活动信息 @Select({ "" }) - List select(Recharge recharge); + List select(RechargeVo rechargeVo); } 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 b15fda6..8543766 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 @@ -13,6 +13,9 @@ import org.springframework.stereotype.Service; import com.github.pagehelper.PageInfo; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; import java.util.List; @Service @@ -40,8 +43,26 @@ public class ActivityServiceImpl implements ActivityService { public PageInfo searchForPage(Integer pageNum, Integer pageSize, Activity activity) { +// PageHelper.startPage(pageNum, pageSize); +// List list = activityMapper.select(activity); +// return new PageInfo<>(list); + PageHelper.startPage(pageNum, pageSize); List list = activityMapper.select(activity); + LocalDate nowDate = LocalDate.now(); // 获取当前的 LocalDate + list.stream() + .forEach(activity1 -> { + if (nowDate.isBefore(activity1.getStartTime())) { + // 假设 Activity 类有一个 setStatus 方法来设置状态 + activity1.setStatus(0); // 设置新的状态 + activityMapper.edit(activity1); // 保存修改后的对象 + } + else if(nowDate.isAfter(activity1.getEndTime())) { + // 假设 Activity 类有一个 setStatus 方法来设置状态 + activity1.setStatus(2); // 设置新的状态 + activityMapper.edit(activity1); // 保存修改后的对象 + } + }); return new PageInfo<>(list); } } 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 f628bbd..5d5eee0 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 @@ -1,6 +1,7 @@ package com.example.recharge.service; import com.example.commons.domain.entity.Recharge; +import com.example.commons.domain.vo.RechargeVo; import com.example.commons.sevice.RechargeService; import com.example.recharge.mapper.RechargeMapper; import com.github.pagehelper.PageHelper; @@ -31,14 +32,14 @@ public class RechargeServiceImpl implements RechargeService { } @Override - public List search(Recharge recharge) { - return rechargeMapper.select(recharge); + public List search(RechargeVo rechargeVo) { + return rechargeMapper.select(rechargeVo); } @Override - public PageInfo searchForPage(Integer pageNum, Integer pageSize, Recharge recharge) { + public PageInfo searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) { PageHelper.startPage(pageNum,pageSize); - List list= rechargeMapper.select(recharge); + List list= rechargeMapper.select(rechargeVo); return new PageInfo<>(list); } }