From c99ceb1d0043a327e197e4c2fd6f3d11f67eaded Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Mon, 2 Dec 2024 13:17:54 +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=BA=8C=E7=89=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/audit/mapper/AuditMapper.java | 3 +- .../com/example/commons/domain/entity/Detail.java | 3 +- .../example/commons/domain/vo/ConsumeDetail.java | 1 + .../com/example/commons/domain/vo/DetailVo.java | 48 +++++++++++++++++ .../java/com/example/commons/domain/vo/Page.java | 1 + .../com/example/commons/domain/vo/RechargeVo.java | 2 + .../com/example/commons/sevice/ConsumeService.java | 22 ++++++++ .../com/example/commons/sevice/RefundService.java | 17 ++++++ .../consume/controller/ConsumeController.java | 55 +++++++++++++++++++ .../com/example/consume/mapper/ConsumeMapper.java | 59 +++++++++++++++++++++ .../consume/service/ConsumeServiceImpl.java | 52 ++++++++++++++++++ demo/consume/src/main/resources/application.yml | 15 ++++++ demo/pom.xml | 2 + .../recharge/controller/RateController.java | 22 ++++---- .../com/example/recharge/mapper/RateMapper.java | 24 +++++---- .../example/recharge/mapper/RechargeMapper.java | 2 +- .../fefund/controller/RefundController.java | 57 ++++++++++++++++++++ .../com/example/fefund/mapper/RefundMapper.java | 46 ++++++++++++++++ .../example/fefund/service/RefundServiceImpl.java | 61 ++++++++++++++++++++++ demo/refund/src/main/resources/application.yml | 15 ++++++ .../statistics/service/DetailServiceImpl.java | 12 ++++- 21 files changed, 492 insertions(+), 27 deletions(-) create mode 100644 demo/commons/src/main/java/com/example/commons/domain/vo/DetailVo.java create mode 100644 demo/commons/src/main/java/com/example/commons/sevice/ConsumeService.java create mode 100644 demo/commons/src/main/java/com/example/commons/sevice/RefundService.java create mode 100644 demo/consume/src/main/java/com/example/consume/controller/ConsumeController.java create mode 100644 demo/consume/src/main/java/com/example/consume/mapper/ConsumeMapper.java create mode 100644 demo/consume/src/main/java/com/example/consume/service/ConsumeServiceImpl.java create mode 100644 demo/consume/src/main/resources/application.yml create mode 100644 demo/refund/src/main/java/com/example/fefund/controller/RefundController.java create mode 100644 demo/refund/src/main/java/com/example/fefund/mapper/RefundMapper.java create mode 100644 demo/refund/src/main/java/com/example/fefund/service/RefundServiceImpl.java create mode 100644 demo/refund/src/main/resources/application.yml diff --git a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java index 3baaace..cce9b94 100644 --- a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java +++ b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java @@ -47,9 +47,10 @@ public interface AuditMapper { List select(Audit Audit); @Select({ "" + }) + List select(DetailVo detailVo); +} diff --git a/demo/consume/src/main/java/com/example/consume/service/ConsumeServiceImpl.java b/demo/consume/src/main/java/com/example/consume/service/ConsumeServiceImpl.java new file mode 100644 index 0000000..68b45ea --- /dev/null +++ b/demo/consume/src/main/java/com/example/consume/service/ConsumeServiceImpl.java @@ -0,0 +1,52 @@ +package com.example.consume.service; + + +import com.example.commons.domain.entity.Admin; +import com.example.commons.domain.entity.Detail; +import com.example.commons.domain.entity.User; +import com.example.commons.domain.vo.DetailVo; +import com.example.commons.sevice.ConsumeService; +import com.example.consume.mapper.ConsumeMapper; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ConsumeServiceImpl implements ConsumeService { + @Autowired + ConsumeMapper consumeMapper; + + @Override + //新增消费记录 + public int insert(Detail detail) { + + //添加表单数据 + return consumeMapper.insert(detail); + } + @Override + public User getByUserId(Integer userId) { + return consumeMapper.getByUserId(userId); + } + @Override + public Admin getByadminId(Integer adminId) { + return consumeMapper.getByadminId(adminId); + } + + + @Override + public List search(DetailVo detailVo) { + return consumeMapper.select(detailVo); + } + + + @Override + public PageInfo searchForPage(Integer pageNum, Integer pageSize, DetailVo detailVo) { + PageHelper.startPage(pageNum, pageSize); + List list = consumeMapper.select(detailVo); + return new PageInfo<>(list); + } +} diff --git a/demo/consume/src/main/resources/application.yml b/demo/consume/src/main/resources/application.yml new file mode 100644 index 0000000..703c183 --- /dev/null +++ b/demo/consume/src/main/resources/application.yml @@ -0,0 +1,15 @@ +server: + port: 10050 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=GMT%2b8&serverTimezone=Asia/Shanghai + username: hwgold + password: 'AGX4Z3YMxiCG3GR2' + application: + name: consume +mybatis: + configuration: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/demo/pom.xml b/demo/pom.xml index cd40b48..574b452 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -23,6 +23,8 @@ user audit statistics + consume + refund 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 index 2bf3019..0c8c1e1 100644 --- a/demo/recharge/src/main/java/com/example/recharge/controller/RateController.java +++ b/demo/recharge/src/main/java/com/example/recharge/controller/RateController.java @@ -74,7 +74,7 @@ public class RateController { // } // } -// @GetMapping("/{rateId}") + // @GetMapping("/{rateId}") // public Result get(@PathVariable Integer rateId) { // return Result.success(rateService.getById(rateId)); // } @@ -87,16 +87,16 @@ public class RateController { // return Result.success(rateService.searchForPage(pageNum,pageSize,rate)); // } // } - @PostMapping("/search") // 改为 POST 请求 - public Result search(@RequestBody Page page) { - Integer pageNum = page.getPageNum(); - Integer pageSize = page.getPageSize(); - Rate rate = page.getRate(); + @PostMapping("/search") // 改为 POST 请求 + public Result search(@RequestBody Page page) { + Integer pageNum = page.getPageNum(); + Integer pageSize = page.getPageSize(); + Rate rate = page.getRate(); - if (ObjectUtils.isEmpty(pageNum)) { - return Result.success(rateService.search(rate)); - } else { - return Result.success(rateService.searchForPage(pageNum, pageSize, rate)); - } + 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/mapper/RateMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java index b1ef414..a35b2e2 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java @@ -12,9 +12,9 @@ public interface RateMapper { @Insert({ "insert into rate", - "(start_time,end_time,currency,exchange_rate,create_time,update_time,amin_id)", + "(start_time,end_time,currency,exchange_rate,create_time,update_time,admin_id)", "values", - "(#{startTime},#{endTime},#{currency},#{exchangeRate},#{createTime},#{updateTime},#{adminId})" + "(#{startTime},#{endTime},#{currency},#{exchangeRate},now(),#{updateTime},#{adminId})" }) // 获取自增主键 @Options(useGeneratedKeys = true,keyColumn = "rate_id",keyProperty = "rateId") @@ -34,7 +34,7 @@ public interface RateMapper { "currency=#{currency},", "exchange_rate=#{exchangeRate},", "update_time=#{updateTime},", - "admin_id=#{adminId},", + "admin_id=#{adminId},", "", "where rate_id = #{rateId}", "" @@ -48,15 +48,17 @@ public interface RateMapper { @Select({ "" 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 index 1ab9533..7615d93 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java @@ -30,7 +30,7 @@ public interface RechargeMapper { @Select({ "" + }) + List select(Detail detail); +} diff --git a/demo/refund/src/main/java/com/example/fefund/service/RefundServiceImpl.java b/demo/refund/src/main/java/com/example/fefund/service/RefundServiceImpl.java new file mode 100644 index 0000000..4850cce --- /dev/null +++ b/demo/refund/src/main/java/com/example/fefund/service/RefundServiceImpl.java @@ -0,0 +1,61 @@ +package com.example.fefund.service; + + +import com.example.commons.domain.entity.Detail; +import com.example.commons.sevice.RefundService; +import com.example.fefund.mapper.RefundMapper; +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; + + +@RequiredArgsConstructor +@Transactional +@Service +public class RefundServiceImpl implements RefundService { + private final RefundMapper refundMapper; + @Override + public int add(Detail detail) throws Exception { + return refundMapper.insert(detail); + } + + @Override + public void edit(Detail newDetail) throws Exception { + // 获取旧的明细记录 + Detail oldDetail = refundMapper.selectByDetailId(newDetail.getDetailId()); + + if (oldDetail == null || oldDetail.getDetailFlag() ==0) { + throw new IllegalArgumentException("该记录不存在或已被隐藏！"); + } + + // 软删除旧记录 + refundMapper.update(oldDetail.getDetailId()); + + // 插入新记录 + newDetail.setDetailId(null); // 清空 ID，让其自动生成 + newDetail.setDetailFlag(1); // 确保新记录未被删除 + refundMapper.insert(newDetail); + } + + @Override + public Detail selectByDetailId(Integer detailId) { + return null; + } + + @Override + public List search(Detail detail) { + return refundMapper.select(detail); + } + + @Override + public PageInfo searchForPage(Integer pageNum, Integer pageSize, Detail detail) { + PageHelper.startPage(pageNum, pageSize); + List list = refundMapper.select(detail); + return new PageInfo<>(list); + } +} diff --git a/demo/refund/src/main/resources/application.yml b/demo/refund/src/main/resources/application.yml new file mode 100644 index 0000000..ba4d1a4 --- /dev/null +++ b/demo/refund/src/main/resources/application.yml @@ -0,0 +1,15 @@ +server: + port: 10060 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8 + username: hwgold + password: 'AGX4Z3YMxiCG3GR2' + application: + name: refund +mybatis: + configuration: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java b/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java index 7718a6b..8803eeb 100644 --- a/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java +++ b/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java @@ -1,9 +1,13 @@ package com.example.statistics.service; import com.example.commons.domain.entity.Detail; +import com.example.commons.domain.vo.RechargeVo; import com.example.commons.sevice.DetailService; +import com.example.statistics.mapper.DetailMapper; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -13,9 +17,11 @@ import java.util.List; @Transactional @RequiredArgsConstructor public class DetailServiceImpl implements DetailService { + @Autowired + private DetailMapper detailMapper; @Override public int add(Detail detail) { - return 0; + return detailMapper.add(detail); } @Override @@ -36,6 +42,8 @@ public class DetailServiceImpl implements DetailService { @Override public PageInfo getDetailByPage(int pageNum, int pageSize, Detail detail) { - return null; + PageHelper.startPage(pageNum, pageSize); + List list= detailMapper.select(detail); + return new PageInfo<>(list); } }