From 9d9d0faefa27a855363a3251bdcf13447c633351 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 30 Jul 2025 18:29:30 +0800 Subject: [PATCH] =?UTF-8?q?7=E6=9C=8830=E6=97=A5=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/bean/BeanRechargeController.java | 41 +++++++++++++++++++++- .../com/example/demo/domain/vo/bean/BeanPage.java | 1 + .../example/demo/domain/vo/bean/BeanRecharge.java | 10 ------ .../demo/domain/vo/bean/BeanRechargeInfo.java | 39 ++++++++++++++++++++ .../demo/mapper/bean/BeanRechargeMapper.java | 22 ++++++++++++ .../demo/service/bean/BeanRechargeService.java | 6 ++++ .../serviceImpl/bean/BeanRechargeServiceImpl.java | 18 ++++++++++ .../resources/jindouMapper/BeanRechargeMapper.xml | 18 ++++++++++ 8 files changed, 144 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java create mode 100644 src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java create mode 100644 src/main/resources/jindouMapper/BeanRechargeMapper.xml diff --git a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java index 3101ec4..508d087 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java @@ -1,13 +1,22 @@ package com.example.demo.controller.bean; +import com.example.demo.Util.JWTUtil; +import com.example.demo.domain.entity.Admin; import com.example.demo.domain.vo.bean.BeanRecharge; +import com.example.demo.domain.vo.bean.BeanPage; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.bean.BeanRechargeService; -import com.example.demo.service.bean.BeanUserService; +import jakarta.servlet.http.HttpServletRequest; 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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.util.Arrays; +import java.util.List; /** * @program: gold-java @@ -37,4 +46,34 @@ public class BeanRechargeController { return Result.error("添加失败"); } } + + //系统充值 + @PostMapping("/selectBySystem") + public Result selectBySystem(@RequestBody BeanPage page) { + try { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + //解token权限 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + if (admin != null) { + List list = Arrays.asList(admin.getMarkets().split(",")); + page.getBeanRechargeInfo().setMarkets(list); + } + else{ + return Result.error("角色为空"); + } + return Result.success(beanRechargeService.selectBySystem(page.getPageNum(), page.getPageSize(), page.getBeanRechargeInfo())); + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error("请检查筛选数据的格式"); + } + + } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java b/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java index 7276efb..54000ef 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanPage.java @@ -21,4 +21,5 @@ public class BeanPage { private Integer pageSize; private BeanConsumeLive beanConsumeLive; + private BeanRechargeInfo beanRechargeInfo; } diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java b/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java index 72577fd..c31756c 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java @@ -21,14 +21,4 @@ public class BeanRecharge { private Integer freeBean; // 免费豆 private Integer permanentBean; // 永久豆 private String remark; //备注 - - - - - - - - - - } diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java new file mode 100644 index 0000000..5952369 --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java @@ -0,0 +1,39 @@ +package com.example.demo.domain.vo.bean; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + +/** + * @program: gold-java + * @ClassName BeanRecharge + * @description: + * @author: Double + * @create: 2025−07-30 15:11 + * @Version 1.0 + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class BeanRechargeInfo { + + private Long id;//id + private Integer jwcode; // 精网号 + private String name; // 姓名 + private String market; // 所属地区 + private Integer freeBean; // 免费豆 + private Integer permanentBean; // 永久豆 + private Integer num; // 数量 + private Double amount; // 金额 + private String orderNo; // 订单号 + private String remark; //备注 + private String platform; // 充值平台 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date rechargeTime; // 充值时间 + private List markets; // 地区列表 +} diff --git a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java new file mode 100644 index 0000000..2beaf4b --- /dev/null +++ b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java @@ -0,0 +1,22 @@ +package com.example.demo.mapper.bean; + + +import com.example.demo.domain.vo.bean.BeanRechargeInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @program: gold-java + * @ClassName BeanRechargeMapper + * @description: + * @author: Double + * @create: 2025−07-30 15:43 + * @Version 1.0 + **/ + +@Mapper +public interface BeanRechargeMapper { + + List selectBySystem(BeanRechargeInfo beanRechargeInfo); +} diff --git a/src/main/java/com/example/demo/service/bean/BeanRechargeService.java b/src/main/java/com/example/demo/service/bean/BeanRechargeService.java index dc06862..3597c5e 100644 --- a/src/main/java/com/example/demo/service/bean/BeanRechargeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanRechargeService.java @@ -1,8 +1,11 @@ package com.example.demo.service.bean; +import com.example.demo.domain.vo.bean.BeanRechargeInfo; +import com.example.demo.domain.vo.coin.RefundUser; import com.example.demo.domain.vo.coin.Result; import com.example.demo.domain.vo.bean.BeanRecharge; +import com.github.pagehelper.PageInfo; /** * @program: gold-java @@ -16,4 +19,7 @@ import com.example.demo.domain.vo.bean.BeanRecharge; public interface BeanRechargeService { Result add(BeanRecharge recharge); + + PageInfo selectBySystem(Integer pageNum, Integer pageSize, BeanRechargeInfo beanRechargeInfo); + } \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java index dec9e70..e7b79be 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -1,8 +1,13 @@ package com.example.demo.serviceImpl.bean; import com.example.demo.domain.vo.bean.BeanRecharge; +import com.example.demo.domain.vo.bean.BeanRechargeInfo; +import com.example.demo.domain.vo.coin.RechargeUser; import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.bean.BeanRechargeMapper; import com.example.demo.service.bean.BeanRechargeService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -10,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import java.util.List; import java.util.UUID; /** @@ -27,6 +33,9 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { @Autowired private RestTemplate restTemplate; + @Autowired + private BeanRechargeMapper beanRechargeMapper; + //新增金豆 @Override public Result add(BeanRecharge recharge) { @@ -78,4 +87,13 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { return Result.error("系统异常：" + e.getMessage()); } } + + + //系统充值明细 + @Override + public PageInfo selectBySystem(Integer pageNum, Integer pageSize, BeanRechargeInfo beanRechargeInfo){ + PageHelper.startPage(pageNum, pageSize); + List beanRechargeInfos = beanRechargeMapper.selectBySystem(beanRechargeInfo); + return new PageInfo<>(beanRechargeInfos); + } } \ No newline at end of file diff --git a/src/main/resources/jindouMapper/BeanRechargeMapper.xml b/src/main/resources/jindouMapper/BeanRechargeMapper.xml new file mode 100644 index 0000000..762172f --- /dev/null +++ b/src/main/resources/jindouMapper/BeanRechargeMapper.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file