From 092790fd272aef2b14016caf0b202084fc8cdefb Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Mon, 17 Mar 2025 11:25:51 +0800 Subject: [PATCH] =?UTF-8?q?3.16=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../example/demo/controller/DetailYController.java | 11 ++- .../demo/controller/RechargeController.java | 5 ++ .../com/example/demo/domain/entity/Detail.java | 3 +- .../com/example/demo/domain/entity/DetailY.java | 2 + .../com/example/demo/domain/vo/ConsumeDetail.java | 3 + .../com/example/demo/domain/vo/DetailYgold.java | 3 + .../com/example/demo/domain/vo/RechargeVo.java | 2 + .../java/com/example/demo/domain/vo/RefundA.java | 4 + .../com/example/demo/domain/vo/SumDetailY.java | 27 ++++++ .../com/example/demo/mapper/DetailYMapper.java | 7 ++ .../com/example/demo/mapper/RechargeMapper.java | 1 + .../java/com/example/demo/mapper/RefundMapper.java | 2 +- .../demo/serviceImpl/DetailYServiceImpl.java | 30 ++++++- .../demo/serviceImpl/RechargeServiceImpl.java | 5 ++ .../demo/serviceImpl/RefundServiceImpl.java | 46 ++++++++-- .../com/example/demo/sevice/DetailYService.java | 4 + .../com/example/demo/sevice/RechargeService.java | 1 + src/main/resources/application.yml | 3 +- src/main/resources/mapper/DetailYMapper.xml | 99 +++++++++++++++++++++- src/main/resources/mapper/RechargeMapper.xml | 8 ++ src/main/resources/mapper/RefundMapper.xml | 7 +- 22 files changed, 252 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/vo/SumDetailY.java diff --git a/pom.xml b/pom.xml index ccb267f..09fb9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ com.example demo 0.0.2-SNAPSHOT + demo demo diff --git a/src/main/java/com/example/demo/controller/DetailYController.java b/src/main/java/com/example/demo/controller/DetailYController.java index 5731dc3..404344b 100644 --- a/src/main/java/com/example/demo/controller/DetailYController.java +++ b/src/main/java/com/example/demo/controller/DetailYController.java @@ -4,10 +4,7 @@ package com.example.demo.controller; import com.example.demo.domain.entity.Detail; import com.example.demo.domain.entity.DetailY; import com.example.demo.domain.entity.UserDetailExport; -import com.example.demo.domain.vo.DetailExport; -import com.example.demo.domain.vo.ERP; -import com.example.demo.domain.vo.Page; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.*; import com.example.demo.sevice.DetailService; import com.example.demo.sevice.DetailYService; //import com.example.demo.sevice.OtherService; @@ -18,6 +15,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.List; @RestController @@ -65,4 +63,9 @@ public class DetailYController { log.info("erp:{}", erp); return Result.success(otherService.addERP(erp)); } + @PostMapping("/getDetailY") + public Result getDetailY(@RequestBody SumDetailY sumDetailY) { + List result = detailYService.getDetailY(sumDetailY); + return Result.success(result); + } } diff --git a/src/main/java/com/example/demo/controller/RechargeController.java b/src/main/java/com/example/demo/controller/RechargeController.java index 7de615e..7c2865e 100644 --- a/src/main/java/com/example/demo/controller/RechargeController.java +++ b/src/main/java/com/example/demo/controller/RechargeController.java @@ -117,4 +117,9 @@ public class RechargeController { List result = rechargeService.getRechargeA(rechargeA); return Result.success(result); } + @PostMapping("/getWay") + public Result getWay() { + List result = rechargeService.getWay(); + return Result.success(result); + } } diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index 8968cce..40d85be 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -68,7 +68,8 @@ public class Detail implements Serializable { private BigDecimal allGold; private Integer typeR;//选择退款部分 - + private String sortField; + private String sortOrder; } diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java index 6481863..c2cdfb5 100644 --- a/src/main/java/com/example/demo/domain/entity/DetailY.java +++ b/src/main/java/com/example/demo/domain/entity/DetailY.java @@ -76,4 +76,6 @@ public class DetailY implements Serializable { private String sortField; private String sortOrder; + + private String num; } diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java index 0ac5ce4..6f8955f 100644 --- a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java +++ b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java @@ -47,4 +47,7 @@ public class ConsumeDetail { private String productName; private String username; + private String sortField; + private String sortOrder; + } diff --git a/src/main/java/com/example/demo/domain/vo/DetailYgold.java b/src/main/java/com/example/demo/domain/vo/DetailYgold.java index 8ec3589..aa256ef 100644 --- a/src/main/java/com/example/demo/domain/vo/DetailYgold.java +++ b/src/main/java/com/example/demo/domain/vo/DetailYgold.java @@ -22,4 +22,7 @@ public class DetailYgold { private BigDecimal SumcoreJb; private BigDecimal Sumfree12; private BigDecimal Sumfree6; + + private String sortField; + private String sortOrder; } diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java index 3014372..5bc56c8 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java +++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java @@ -44,5 +44,7 @@ public class RechargeVo { private String orderCode; private String adminName; + private String sortField; + private String sortOrder; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/vo/RefundA.java b/src/main/java/com/example/demo/domain/vo/RefundA.java index eeeb39b..a82f6fc 100644 --- a/src/main/java/com/example/demo/domain/vo/RefundA.java +++ b/src/main/java/com/example/demo/domain/vo/RefundA.java @@ -35,4 +35,8 @@ public class RefundA { private String status; private String refundType; private String refundGoods; + + private String category; + private BigDecimal amount; + } diff --git a/src/main/java/com/example/demo/domain/vo/SumDetailY.java b/src/main/java/com/example/demo/domain/vo/SumDetailY.java new file mode 100644 index 0000000..0cd25bf --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/SumDetailY.java @@ -0,0 +1,27 @@ +package com.example.demo.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SumDetailY { + private BigDecimal sumR; + private BigDecimal sumT; + private BigDecimal sumF; + private List updateTypes; + private String token; + private Date startDate; + private Date endDate; + private String area; + private String jwcode; + private Integer updateType; + private String consumePlatform; + private String types; +} diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index 3133c2d..51ed7dd 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -4,6 +4,7 @@ import com.example.demo.domain.entity.DetailY; import com.example.demo.domain.entity.UserDetailExport; import com.example.demo.domain.vo.DetailYgold; import com.example.demo.domain.vo.DetailExport; +import com.example.demo.domain.vo.SumDetailY; import org.apache.ibatis.annotations.*; import java.util.List; @@ -13,6 +14,10 @@ public interface DetailYMapper { DetailYgold getgold(DetailYgold detailYgold); + List getDetailY(SumDetailY sumDetailY); + + + @Insert({ // "insert into detail_y", @@ -101,6 +106,8 @@ public interface DetailYMapper { // // }) List select(DetailY detailY); + List select1(DetailY detailY); + @Select({ "" }) - List select(Detail detail); + List select(Detail detail); } diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java index 8ae86e2..2bde6d2 100644 --- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java @@ -4,6 +4,7 @@ import com.example.demo.domain.entity.DetailY; import com.example.demo.domain.entity.UserDetailExport; import com.example.demo.domain.vo.DetailExport; import com.example.demo.domain.vo.DetailYgold; +import com.example.demo.domain.vo.SumDetailY; import com.example.demo.mapper.DetailYMapper; import com.example.demo.sevice.DetailYService; import com.github.pagehelper.PageHelper; @@ -14,6 +15,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -50,9 +52,23 @@ public class DetailYServiceImpl implements DetailYService { @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()") @Override public PageInfo getDetailByPage(int pageNum, int pageSize, DetailY detailY) { - PageHelper.startPage(pageNum, pageSize); - List list = detailYMapper.select(detailY); - return new PageInfo<>(list); + if(detailY.getNum()!=null) { + if (detailY.getNum().equals("1")) { + PageHelper.startPage(pageNum, pageSize); + List list = detailYMapper.select(detailY); + return new PageInfo<>(list); + } else if (detailY.getNum().equals("2")) { + PageHelper.startPage(pageNum, pageSize); + List list = detailYMapper.select1(detailY); + return new PageInfo<>(list); + } + } + else if (detailY.getNum() == null) { + PageHelper.startPage(pageNum, pageSize); + List list = detailYMapper.select(detailY); + return new PageInfo<>(list); + } + return null; } @Override @@ -60,6 +76,14 @@ public class DetailYServiceImpl implements DetailYService { return detailYMapper.searchAll(detailExport); } + @Override + public List getDetailY(SumDetailY sumdetailY) { + System.out.println("------------------------------------------------------------------"); + System.out.println(detailYMapper.getDetailY(sumdetailY)); + System.out.println("------------------------------------------------------------------"); + return detailYMapper.getDetailY(sumdetailY); + } + // @Override // public List searchAll(UserDetailExport userDetailExport) { // return detailYMapper.searchExport(); diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index 3a329a2..818a875 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -211,5 +211,10 @@ public class RechargeServiceImpl implements RechargeService { } + + @Override + public List getWay() { + return rechargeMapper.getWay(); + } } diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java index 1229ea7..1c4d176 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java @@ -15,6 +15,8 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -28,25 +30,27 @@ public class RefundServiceImpl implements RefundService { @CacheEvict(value = {"refund", "audit"}, allEntries = true) @Override - public int add(Detail detail) { + public int add(Detail detail) { // 生成UUID作为订单编号 String uuid = UUID.randomUUID().toString().replaceAll("-", ""); // 去掉UUID中的'-' detail.setOrderCode(uuid); return refundMapper.insert(detail); } - @CacheEvict(value = {"refund", "audit"}, allEntries = true) @Override + @CacheEvict(value = {"refund", "audit"}, allEntries = true) + @Override public int addAudit(Detail detail) { return refundMapper.insertAudit(detail); } //自动软删除数据加更新数据 - @CacheEvict(value = {"refund", "audit"}, allEntries = true) @Override + @CacheEvict(value = {"refund", "audit"}, allEntries = true) + @Override public void edit(Detail newDetail) { // 获取旧的明细记录 Detail oldDetail = refundMapper.selectByDetailId(newDetail.getDetailId()); - if (oldDetail == null || oldDetail.getDetailFlag() ==0) { + if (oldDetail == null || oldDetail.getDetailFlag() == 0) { throw new IllegalArgumentException("该记录不存在或已被隐藏！"); } @@ -70,7 +74,8 @@ public class RefundServiceImpl implements RefundService { } @Override - @CacheEvict(value = {"refund", "recharge"}, allEntries = true) public int update(Integer contactId) { + @CacheEvict(value = {"refund", "recharge"}, allEntries = true) + public int update(Integer contactId) { return refundMapper.updateOrderCode(contactId); } @@ -82,7 +87,7 @@ public class RefundServiceImpl implements RefundService { @CacheEvict(value = {"refund", "recharge"}, allEntries = true) @Override - public int softDelete(Integer detailId) { + public int softDelete(Integer detailId) { return refundMapper.update(detailId); } @@ -118,8 +123,33 @@ public class RefundServiceImpl implements RefundService { return new PageInfo<>(list); } +// @Override +// public List getRefundA(RefundA refundA) { +// return refundMapper.getRefundA(refundA); +// } + @Override public List getRefundA(RefundA refundA) { - return refundMapper.getRefundA(refundA); + // 执行原始查询，获取实际存在的分类及其汇总值 + List result = refundMapper.getRefundA(refundA); + + // 定义完整的分类列表 + List fullStatuses = Arrays.asList("待审核", "已通过", "已驳回"); + + // 遍历分类列表，检查哪些分类在查询结果中缺失，并为其补充默认值 + for (String status : fullStatuses) { + boolean categoryExists = result.stream() + .anyMatch(refund -> status.equals(refund.getStatus())); + + if (!categoryExists) { + // 如果分类缺失，补充默认值 + RefundA defaultRefund = new RefundA(); + defaultRefund.setStatus(status); + defaultRefund.setAmount(BigDecimal.ZERO); // 默认值为 0 + result.add(defaultRefund); + } + } + + return result; } -} +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/sevice/DetailYService.java b/src/main/java/com/example/demo/sevice/DetailYService.java index 7117272..657eaeb 100644 --- a/src/main/java/com/example/demo/sevice/DetailYService.java +++ b/src/main/java/com/example/demo/sevice/DetailYService.java @@ -4,6 +4,7 @@ import com.example.demo.domain.entity.DetailY; import com.example.demo.domain.entity.UserDetailExport; import com.example.demo.domain.vo.DetailExport; import com.example.demo.domain.vo.DetailYgold; +import com.example.demo.domain.vo.SumDetailY; import com.github.pagehelper.PageInfo; import java.util.List; @@ -16,4 +17,7 @@ public interface DetailYService { PageInfo getDetailByPage(int pageNum, int pageSize, DetailY detailY); List searchAll(DetailExport detailExport); + + List getDetailY(SumDetailY sumDetailY); + } diff --git a/src/main/java/com/example/demo/sevice/RechargeService.java b/src/main/java/com/example/demo/sevice/RechargeService.java index c6edd08..66338ba 100644 --- a/src/main/java/com/example/demo/sevice/RechargeService.java +++ b/src/main/java/com/example/demo/sevice/RechargeService.java @@ -29,4 +29,5 @@ public interface RechargeService { Result addRecharges(List recharges); List getRechargeA(RechargeA rechargeA); + List getWay(); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ea46ada..f9852be 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,7 @@ server: port: 10702 # port: 10010 +# port:10704 spring: servlet: @@ -17,7 +18,7 @@ spring: pool-name: HwgoldHikariCP driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai - url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=Asia/Shanghai + url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai username: hwgold password: 'AGX4Z3YMxiCG3GR2' application: diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml index 9d3dff0..4df11fd 100644 --- a/src/main/resources/mapper/DetailYMapper.xml +++ b/src/main/resources/mapper/DetailYMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT username, name, @@ -18,6 +18,12 @@ FROM detail_y + + + and recharge_coin NOT LIKE '-%' + AND free_coin NOT LIKE '-%' + AND task_coin NOT LIKE '-%' + AND detail_y.jwcode = #{jwcode} @@ -51,6 +57,60 @@ + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index 7717c53..4b60c74 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -7,6 +7,7 @@ + \ No newline at end of file diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index c50463c..00821e6 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -6,7 +6,7 @@