From 12c901afb38604059a304fb7e3c75b44a278039d Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Thu, 28 Nov 2024 20:01:28 +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 | 23 +++++ .../com/example/commons/domain/entity/Audit.java | 2 + .../com/example/commons/domain/entity/Page.java | 11 +++ .../com/example/commons/domain/entity/Rate.java | 19 ++++ .../commons/domain/entity/RateSearchRequest.java | 10 ++ .../example/commons/domain/entity/Recharge.java | 3 + .../com/example/commons/domain/entity/User.java | 1 + .../example/commons/sevice/ActivityService.java | 17 ++++ .../com/example/commons/sevice/AuditService.java | 14 +++ .../com/example/commons/sevice/RateService.java | 16 ++++ .../example/commons/sevice/RechargeService.java | 4 +- .../com/example/commons/sevice/UserSevice.java | 7 +- demo/pom.xml | 5 + .../recharge/controller/ActivityController.java | 68 ++++++++++++++ .../recharge/controller/AuditController.java | 41 +++++++++ .../recharge/controller/RateController.java | 101 +++++++++++++++++++++ .../recharge/controller/RechargeController.java | 52 +++++++++++ .../example/recharge/mapper/ActivityMapper.java | 64 +++++++++++++ .../com/example/recharge/mapper/AuditMapper.java | 36 ++++++++ .../com/example/recharge/mapper/RateMapper.java | 65 +++++++++++++ .../example/recharge/mapper/RechargeMapper.java | 47 ++++++++++ .../recharge/service/ActivityServiceImpl.java | 47 ++++++++++ .../example/recharge/service/AuditServiceImpl.java | 35 +++++++ .../example/recharge/service/RateServiceImpl.java | 54 +++++++++++ .../recharge/service/RechargeServiceImpl.java | 44 +++++++++ .../example/user/controller/UserController.java | 13 ++- .../java/com/example/user/mapper/UserMapper.java | 8 +- .../com/example/user/service/UserServiceImpl.java | 17 +++- 28 files changed, 810 insertions(+), 14 deletions(-) create mode 100644 demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java create mode 100644 demo/commons/src/main/java/com/example/commons/domain/entity/Page.java create mode 100644 demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java create mode 100644 demo/commons/src/main/java/com/example/commons/domain/entity/RateSearchRequest.java create mode 100644 demo/commons/src/main/java/com/example/commons/sevice/ActivityService.java create mode 100644 demo/commons/src/main/java/com/example/commons/sevice/AuditService.java create mode 100644 demo/commons/src/main/java/com/example/commons/sevice/RateService.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/controller/RateController.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/mapper/AuditMapper.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/service/AuditServiceImpl.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/service/RateServiceImpl.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.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 new file mode 100644 index 0000000..8cc66fc --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java @@ -0,0 +1,23 @@ +package com.example.commons.domain.entity; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Data + +public class Activity { + private int activityId ; + private int adminId; + private String dept; + private LocalDate startTime; + private LocalDate endTime; + private String activityName; + private BigDecimal rechargeRatio; + private LocalDateTime createTime; + private int flag; + + +} 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 7b596e4..f085906 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 @@ -20,4 +20,6 @@ public class Audit { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + private Date startDate; + private Date endDate; } diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Page.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Page.java new file mode 100644 index 0000000..2b489a5 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Page.java @@ -0,0 +1,11 @@ +package com.example.commons.domain.entity; + +import lombok.Data; + +@Data +public class Page { + private Integer pageNum; + private Integer pageSize; + + private Activity activity; +} diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java new file mode 100644 index 0000000..dcba6f9 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java @@ -0,0 +1,19 @@ +package com.example.commons.domain.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +public class Rate { + private Integer rateId; + private Date startTime; + private Date endTime; + private String currency; + private String exchangeRate; + private Date createTime; + private Date updateTime; + private String updateName; +} 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 new file mode 100644 index 0000000..ee7e318 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/RateSearchRequest.java @@ -0,0 +1,10 @@ +package com.example.commons.domain.entity; + +import lombok.Data; + +@Data +public class RateSearchRequest { + private Integer pageNum; + private Integer pageSize; + private Rate rate; +} 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 cde83a4..64776cd 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 @@ -16,6 +16,7 @@ public class Recharge { private Double paidGold; private Double freeGold; private Double rechargeGold; + private String payWay; private String rechargeWay; private Date rechargeTime; private String rechargeVoucher; @@ -27,4 +28,6 @@ public class Recharge { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") 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 7be3076..5a4e0de 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 @@ -12,6 +12,7 @@ import java.util.Date; public class User { private Integer userId; private String name; + private String homilyId; private String password; private String phone; private String email; diff --git a/demo/commons/src/main/java/com/example/commons/sevice/ActivityService.java b/demo/commons/src/main/java/com/example/commons/sevice/ActivityService.java new file mode 100644 index 0000000..a280b6e --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/sevice/ActivityService.java @@ -0,0 +1,17 @@ +package com.example.commons.sevice; + + + +import com.example.commons.domain.entity.Activity; + +import java.util.List; + +public interface ActivityService { + + int add(Activity activity); + + int edit(Activity activity); + + List search(Activity activity); + +} diff --git a/demo/commons/src/main/java/com/example/commons/sevice/AuditService.java b/demo/commons/src/main/java/com/example/commons/sevice/AuditService.java new file mode 100644 index 0000000..1a544f6 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/sevice/AuditService.java @@ -0,0 +1,14 @@ +package com.example.commons.sevice; + +import com.example.commons.domain.entity.Audit; +import com.example.commons.domain.entity.Recharge; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +public interface AuditService { + int add (Audit audit); + List search(Audit audit) ; + PageInfo searchForPage(Integer pageNum, Integer pageSize, Audit audit); +} + diff --git a/demo/commons/src/main/java/com/example/commons/sevice/RateService.java b/demo/commons/src/main/java/com/example/commons/sevice/RateService.java new file mode 100644 index 0000000..f28f51a --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/sevice/RateService.java @@ -0,0 +1,16 @@ +package com.example.commons.sevice; + +import com.example.commons.domain.entity.Rate; +import com.github.pagehelper.PageInfo; + + +import java.util.List; + +public interface RateService { + int add(Rate rate) throws Exception; + int edit(Rate rate) throws Exception; + void delete(Integer rateId) throws Exception; + Rate getById(Integer rateId); + List search(Rate rate); + PageInfo searchForPage(Integer pageNum, Integer pageSize,Rate rate); +} 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 1d638b2..d1139f0 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.github.pagehelper.PageInfo; import java.util.List; @@ -9,5 +10,6 @@ public interface RechargeService { int edit(Recharge recharge) throws Exception; Recharge findById(int id) throws Exception; - List findAll() throws Exception; + List search(Recharge recharge) ; + PageInfo searchForPage(Integer pageNum, Integer pageSize, Recharge recharge); } diff --git a/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java b/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java index f93cb40..c0a7999 100644 --- a/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java +++ b/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java @@ -1,8 +1,13 @@ package com.example.commons.sevice; +import com.example.commons.domain.entity.Recharge; import com.example.commons.domain.entity.User; +import com.github.pagehelper.PageInfo; + +import java.util.List; public interface UserSevice { - User getByHomilyId(String homilyId); + List search(User user) ; + PageInfo searchForPage(Integer pageNum, Integer pageSize, User User); } diff --git a/demo/pom.xml b/demo/pom.xml index 1f96024..7dddee4 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -35,6 +35,11 @@ + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.7 + + org.slf4j slf4j-simple 2.0.0 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 new file mode 100644 index 0000000..2b8e1d8 --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java @@ -0,0 +1,68 @@ +package com.example.recharge.controller; + + +import com.example.commons.domain.entity.Activity; +import com.example.commons.domain.entity.Page; +import com.example.commons.domain.vo.Result; +import com.example.recharge.service.ActivityServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.util.ObjectUtils; +import java.util.Arrays; + + +@RestController +@RequestMapping("/recharge/activity") +//SpringMVC的，为当前类的所有处理器方法，添加路径映射的前缀 +@RequiredArgsConstructor +// lombok的，添加一个包含所有final属性的构造器 +@Slf4j //lombok的，自动添加log的对象，用于日志打印 + +public class ActivityController { + + @Autowired + ActivityServiceImpl activityService; + + //添加活动管理信息 + @PostMapping("/add") + public Result add(@RequestBody Activity activity) { +// try { + System.out.println("------6---"); + int result=activityService.add(activity); + System.out.println(result); + return Result.success(); +// } catch (Exception e) { +// log.warn(Arrays.toString(e.getStackTrace())); +// return Result.error(e.getMessage()); +// } + + } + + //修改活动管理信息 + @PostMapping("/edit") + public Result edit(@RequestBody Activity activity){ + +// try { + Integer num =activityService.edit(activity); + return Result.success(num); +// } catch (Exception e) { +//// log.error(""+e); +//// return Result.error(e.getMessage()); +//// } + } + //查询活动管理信息--模糊+分页查询 + @PostMapping("/select") + public Result search(@RequestBody Page page){ + Integer pageNum = page.getPageNum(); + Integer pageSize=page.getPageSize(); + Activity activity= page.getActivity(); + if (ObjectUtils.isEmpty(pageNum)){ + return Result.success(activityService.search(page.getActivity())); + } + return Result.success(activityService.searchForPage(pageNum,pageSize,activity)); + } + + +} \ No newline at end of file diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java b/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java new file mode 100644 index 0000000..eb28e8e --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/controller/AuditController.java @@ -0,0 +1,41 @@ +package com.example.recharge.controller; + +import com.example.commons.domain.entity.Audit; +import com.example.commons.domain.vo.Result; +import com.example.commons.sevice.AuditService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +@RestController +@RequestMapping("/recharge/audit") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class AuditController { + + private final AuditService auditService; + @PostMapping("/add") + public Result add(@RequestBody Audit audit){ + try { + auditService.add(audit); + return Result.success(); + }catch (Exception e){ + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } + @PostMapping + public Result search(Integer pageNum,Integer pageSize,@RequestBody Audit audit){ + if(ObjectUtils.isEmpty(pageNum)){ + return Result.success(auditService.search(audit)); + } + else { + return Result.success(auditService.searchForPage(pageNum,pageSize,audit)); + } + } +} + diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/RateController.java b/demo/recharge/src/main/java/com/example/recharge/controller/RateController.java new file mode 100644 index 0000000..885c630 --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/controller/RateController.java @@ -0,0 +1,101 @@ +package com.example.recharge.controller; + +import com.example.commons.domain.entity.Rate; +import com.example.commons.domain.entity.RateSearchRequest; +import com.example.commons.domain.vo.Result; +import com.example.commons.sevice.RateService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +@RestController +@RequestMapping("/rates") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class RateController { + private final RateService rateService; + + @PostMapping("/add") + public Result add(@RequestBody Rate rate) { + try { + rateService.add(rate); + return Result.success(); + } catch (Exception e) { + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } + @PostMapping("/update") // 将 PUT 改为 POST + public Result update(@RequestBody Rate rate) { + try { + rateService.edit(rate); + return Result.success(); + } catch (Exception e) { + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } +// @PutMapping("/update") +// public Result update(@RequestBody Rate rate) { +// try { +// rateService.edit(rate); +// return Result.success(); +// } catch (Exception e) { +// log.warn(Arrays.toString(e.getStackTrace())); +// return Result.error(e.getMessage()); +// } +// } + + @PostMapping("/delete/{rateId}") // 将 DELETE 改为 POST + public Result delete(@PathVariable("rateId") Integer rateId) { + try { + rateService.delete(rateId); + return Result.success(); + } catch (Exception e) { + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } +// @DeleteMapping("/{rateId}") +// public Result delete(@PathVariable("rateId") Integer rateId) { +// try { +// rateService.delete(rateId); +// return Result.success(); +// } catch (Exception e) { +// log.warn(Arrays.toString(e.getStackTrace())); +// return Result.error(e.getMessage()); +// } +// } + +// @GetMapping("/{rateId}") +// public Result get(@PathVariable Integer rateId) { +// return Result.success(rateService.getById(rateId)); +// } +// +// @GetMapping +// public Result search(Integer pageNum, Integer pageSize,Rate rate) { +// if(ObjectUtils.isEmpty(pageNum)){ +// return Result.success(rateService.search(rate)); +// }else{ +// return Result.success(rateService.searchForPage(pageNum,pageSize,rate)); +// } +// } + @PostMapping("/search") // 改为 POST 请求 + public Result search(@RequestBody RateSearchRequest searchRequest) { + Integer pageNum = searchRequest.getPageNum(); + Integer pageSize = searchRequest.getPageSize(); + Rate rate = searchRequest.getRate(); + + if (ObjectUtils.isEmpty(pageNum)) { + return Result.success(rateService.search(rate)); + } else { + return Result.success(rateService.searchForPage(pageNum, pageSize, rate)); + } + } +} 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 new file mode 100644 index 0000000..c22f4b8 --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/controller/RechargeController.java @@ -0,0 +1,52 @@ +package com.example.recharge.controller; + + +import com.example.commons.domain.entity.Recharge; +import com.example.commons.domain.vo.Result; +import com.example.commons.sevice.RechargeService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +@RestController +@RequestMapping("/recharge/recharge") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class RechargeController { + + private final RechargeService rechargeService; + + @PostMapping("/add") + public Result add(@RequestBody Recharge recharge) { + try { + rechargeService.add(recharge); + return Result.success(); + } catch (Exception e) { + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } + @PostMapping("/edit") + public Result edit(@RequestBody Recharge recharge) { + try { + rechargeService.edit(recharge); + } catch (Exception e) { + log.warn(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + return Result.success(); + } + @PostMapping + public Result search(Integer pageNum, Integer pageSize,@RequestBody Recharge recharge) { + if(ObjectUtils.isEmpty(pageNum)){ + return Result.success(rechargeService.search(recharge)); + } + else { + return Result.success(rechargeService.searchForPage(pageNum,pageSize,recharge)); + } + } +} 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 new file mode 100644 index 0000000..9da0d16 --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java @@ -0,0 +1,64 @@ +package com.example.recharge.mapper; + + +import com.example.commons.domain.entity.Activity; +import org.apache.ibatis.annotations.*; + +import java.util.List; + +@Mapper +public interface ActivityMapper { + + //增加活动信息 + @Insert({"insert into activity", + "(admin_id,dept,start_time,end_time,recharge_ratio,activity_name,flag,create_time) " , + "values", + "(#{adminId},#{dept},#{startTime},#{endTime},#{rechargeRatio},#{activityName},1,now())" + }) + @Options(useGeneratedKeys = true,keyColumn = "activity_id",keyProperty = "activityId") + int add(Activity activity); + + +// 修改活动信息 + @Update({ + "" + }) + int edit(Activity activity); + + + //查询--根据活动id查询活动信息 + @Select({ + "select activity_id from activity where activity_id=#{activityId}" + }) + Activity selectById(Integer activityId); + + //模糊查询--根据活动id查询活动信息 + @Select({ + "" + + }) + List select(Activity activity); + // + + +} diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/AuditMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/AuditMapper.java new file mode 100644 index 0000000..87e808e --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/AuditMapper.java @@ -0,0 +1,36 @@ +package com.example.recharge.mapper; + +import com.example.commons.domain.entity.Audit; +import com.example.commons.domain.entity.Recharge; +import com.example.commons.sevice.AuditService; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface AuditMapper { + + @Insert({ + "INSERT INTO audit", + "(homily_id,recharge_id,refund_id,name,status,flag)", + "values", + "(#{homilyId},#{rechargeId},#{refundId},#{name},#{status},#{flag})" + }) + int insert(Audit audit); + @Select({ + "" + }) + List select(Audit Audit); +} diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java new file mode 100644 index 0000000..72b62de --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java @@ -0,0 +1,65 @@ +package com.example.recharge.mapper; + +import com.example.commons.domain.entity.Rate; +import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Mapper; + + +import java.util.List; + +@Mapper +public interface RateMapper { + + @Insert({ + "insert into rate", + "(start_time,end_time,currency,exchange_rate,create_time,update_time,update_name)", + "values", + "(#{startTime},#{endTime},#{currency},#{exchangeRate},#{createTime},#{updateTime},#{updateName})" + }) +// 获取自增主键 + @Options(useGeneratedKeys = true,keyColumn = "rate_id",keyProperty = "rateId") + int insert(Rate rate); + + @Delete({ + "delete from rate where rate_id=#{rateId}" + }) + int deleteById(Integer rateId); + + @Update({ + "" + }) + int update(Rate rate); + + @Select({ + "select rate_id from rate where rate_id=#{rateId}" + }) + Rate selectById(Integer rateId); + + @Select({ + "" + + }) + List select(Rate rate); +} diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java new file mode 100644 index 0000000..d10b908 --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java @@ -0,0 +1,47 @@ +package com.example.recharge.mapper; + +import com.example.commons.domain.entity.Recharge; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +@Mapper +public interface RechargeMapper { + + @Insert({ + "INSERT INTO recharge", + "(homily_id,activity_id,paid_gold,free_gold,recharge_gold,pay_way,recharge_way,recharge_time,recharge_voucher,admin_id,area,status,remark,flag)", + "values ", + "(#{homilyId},#{activityId},#{paidGold},#{freeGold},#{rechargeGold},#{payWay},#{rechargeWay},#{rechargeTime},#{rechargeVoucher},#{adminId},#{area},#{status},#{remark},#{flag})" + }) + int insert(Recharge recharge); + + @Update({ + "" + }) + int update(Recharge recharge); + + @Select({ + "" + }) + List select(Recharge recharge); +} 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 new file mode 100644 index 0000000..b15fda6 --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/service/ActivityServiceImpl.java @@ -0,0 +1,47 @@ +package com.example.recharge.service; + + +import com.example.commons.domain.entity.Activity; +import com.example.commons.domain.entity.Page; +import com.example.commons.domain.entity.Rate; +import com.example.commons.sevice.ActivityService; +import com.example.recharge.mapper.ActivityMapper; +import com.github.pagehelper.PageHelper; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageInfo; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +@RequiredArgsConstructor +public class ActivityServiceImpl implements ActivityService { + + @Autowired + ActivityMapper activityMapper; + @Override + public int add(Activity activity) { + return activityMapper.add(activity); + } + + @Override + public int edit(Activity activity) { + return activityMapper.edit(activity); + } + + @Override + public List search(Activity activity) { + return activityMapper.select(activity); + } + + + + public PageInfo searchForPage(Integer pageNum, Integer pageSize, Activity activity) { + PageHelper.startPage(pageNum, pageSize); + List list = activityMapper.select(activity); + return new PageInfo<>(list); + } +} diff --git a/demo/recharge/src/main/java/com/example/recharge/service/AuditServiceImpl.java b/demo/recharge/src/main/java/com/example/recharge/service/AuditServiceImpl.java new file mode 100644 index 0000000..9a9ad0c --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/service/AuditServiceImpl.java @@ -0,0 +1,35 @@ +package com.example.recharge.service; + +import com.example.commons.domain.entity.Audit; +import com.example.commons.domain.entity.Recharge; +import com.example.commons.sevice.AuditService; +import com.example.recharge.mapper.AuditMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class AuditServiceImpl implements AuditService { + private final AuditMapper auditMapper; + + @Override + public int add(Audit audit) { + return auditMapper.insert(audit); + } + + @Override + public List search(Audit audit) { + return auditMapper.select(audit); + } + + @Override + public PageInfo searchForPage(Integer pageNum, Integer pageSize, Audit audit) { + PageHelper.startPage(pageNum,pageSize); + List list= auditMapper.select(audit); + return new PageInfo<>(list); + } +} diff --git a/demo/recharge/src/main/java/com/example/recharge/service/RateServiceImpl.java b/demo/recharge/src/main/java/com/example/recharge/service/RateServiceImpl.java new file mode 100644 index 0000000..fa283fb --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/service/RateServiceImpl.java @@ -0,0 +1,54 @@ +package com.example.recharge.service; + +import com.example.commons.domain.entity.Rate; +import com.example.commons.sevice.RateService; +import com.example.recharge.mapper.RateMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.RequiredArgsConstructor; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class RateServiceImpl implements RateService { + private final RateMapper rateMapper; + @Override + public int add(Rate rate) { + return rateMapper.insert(rate); + } + + @Transactional + @Override + public int edit(Rate rate) { + return rateMapper.update(rate); + } + + @Override + public void delete(Integer rateId) throws Exception { + int result = rateMapper.deleteById(rateId); + if(result == 0){ + throw new Exception("未找到对应的记录，删除失败"); + }; + } + + @Override + public Rate getById(Integer rateId) { + return rateMapper.selectById(rateId); + } + + @Override + public List search(Rate rate) { + return rateMapper.select(rate); + } + + @Override + public PageInfo searchForPage(Integer pageNum, Integer pageSize, Rate rate) { + PageHelper.startPage(pageNum, pageSize); + List list = rateMapper.select(rate); + 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 new file mode 100644 index 0000000..f628bbd --- /dev/null +++ b/demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java @@ -0,0 +1,44 @@ +package com.example.recharge.service; + +import com.example.commons.domain.entity.Recharge; +import com.example.commons.sevice.RechargeService; +import com.example.recharge.mapper.RechargeMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class RechargeServiceImpl implements RechargeService { + + private final RechargeMapper rechargeMapper; + @Override + public int add(Recharge recharge) throws Exception { + return rechargeMapper.insert(recharge); + } + + @Override + public int edit(Recharge recharge) throws Exception { + return rechargeMapper.update(recharge); + } + + @Override + public Recharge findById(int id) throws Exception { + return null; + } + + @Override + public List search(Recharge recharge) { + return rechargeMapper.select(recharge); + } + + @Override + public PageInfo searchForPage(Integer pageNum, Integer pageSize, Recharge recharge) { + PageHelper.startPage(pageNum,pageSize); + List list= rechargeMapper.select(recharge); + return new PageInfo<>(list); + } +} diff --git a/demo/user/src/main/java/com/example/user/controller/UserController.java b/demo/user/src/main/java/com/example/user/controller/UserController.java index 88e85b0..5683e13 100644 --- a/demo/user/src/main/java/com/example/user/controller/UserController.java +++ b/demo/user/src/main/java/com/example/user/controller/UserController.java @@ -1,22 +1,21 @@ package com.example.user.controller; +import com.example.commons.domain.entity.User; import com.example.commons.domain.vo.Result; import com.example.commons.sevice.UserSevice; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/recharge/user") @RequiredArgsConstructor @Slf4j +@CrossOrigin public class UserController { private final UserSevice userSevice; - @PostMapping("/{id}") - public Result getUser(@PathVariable String id) { - return Result.success(userSevice.getByHomilyId(id)); + @PostMapping + public Result User(@RequestBody User user) { + return Result.success(userSevice.search(user)); } } diff --git a/demo/user/src/main/java/com/example/user/mapper/UserMapper.java b/demo/user/src/main/java/com/example/user/mapper/UserMapper.java index ad27a64..2bd6966 100644 --- a/demo/user/src/main/java/com/example/user/mapper/UserMapper.java +++ b/demo/user/src/main/java/com/example/user/mapper/UserMapper.java @@ -1,14 +1,16 @@ package com.example.user.mapper; +import com.example.commons.domain.entity.Audit; import com.example.commons.domain.entity.User; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import java.util.List; + @Mapper public interface UserMapper { @Select({ - "select * from user", - "where homilyId=#{homily_id}" + "select * from user where homily_id=#{homilyId}" }) - User getByHomilyId(String homilyId); + List select(User user); } diff --git a/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java b/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java index cb8f6d4..e278e3d 100644 --- a/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java +++ b/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java @@ -1,20 +1,33 @@ package com.example.user.service; +import com.example.commons.domain.entity.Recharge; import com.example.commons.domain.entity.User; import com.example.commons.sevice.UserSevice; import com.example.user.mapper.UserMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + @Service @RequiredArgsConstructor public class UserServiceImpl implements UserSevice { private final UserMapper userMapper; + + @Override + public List search(User user) { + return userMapper.select(user); + } + @Override - public User getByHomilyId(String homilyId) { - return userMapper.getByHomilyId(homilyId); + public PageInfo searchForPage(Integer pageNum, Integer pageSize, User user) { + PageHelper.startPage(pageNum,pageSize); + List list= userMapper.select(user); + return new PageInfo<>(list); } }