diff --git a/pom.xml b/pom.xml index b3b2b4d..0948cd6 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,11 @@ 3.0.4 test + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.2 + 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 508d087..715cc37 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java @@ -57,17 +57,6 @@ public class BeanRechargeController { 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) { 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 c31756c..02f4ab2 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 @@ -17,8 +17,10 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class BeanRecharge { + private Integer id;//id private Integer jwcode; // 精网号 private Integer freeBean; // 免费豆 private Integer permanentBean; // 永久豆 private String remark; //备注 + private String adminName; // 管理员名称 } 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 index 5952369..58ae730 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java @@ -35,5 +35,11 @@ public class BeanRechargeInfo { private String platform; // 充值平台 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date rechargeTime; // 充值时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date startTime; // 开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date endTime; // 结束时间 private List markets; // 地区列表 + private String sortField; //排序字段 + private String sortOrder; //排序顺序 } diff --git a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java similarity index 90% rename from src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java rename to src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java index 2beaf4b..427a270 100644 --- a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java @@ -16,7 +16,8 @@ import java.util.List; **/ @Mapper -public interface BeanRechargeMapper { +public interface BeanRechargeMapper2 { List selectBySystem(BeanRechargeInfo beanRechargeInfo); -} + +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java b/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java new file mode 100644 index 0000000..f71216e --- /dev/null +++ b/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java @@ -0,0 +1,20 @@ +package com.example.demo.mapper.coin; + + +import com.example.demo.domain.vo.bean.BeanRecharge; +import org.apache.ibatis.annotations.Mapper; + +/** + * @program: gold-java + * @ClassName BeanRechargeMapper + * @description: + * @author: Double + * @create: 2025−07-30 15:43 + * @Version 1.0 + **/ + +@Mapper +public interface BeanRechargeMapper1 { + + int add(BeanRecharge recharge); +} \ 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 e7b79be..8bb36a0 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -2,21 +2,18 @@ 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.mapper.bean.BeanRechargeMapper2; +import com.example.demo.mapper.coin.BeanRechargeMapper1; 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; 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; /** * @program: gold-java @@ -34,7 +31,11 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { private RestTemplate restTemplate; @Autowired - private BeanRechargeMapper beanRechargeMapper; + private BeanRechargeMapper2 beanRechargeMapper2; + + @Autowired + private BeanRechargeMapper1 beanRechargeMapper1; + //新增金豆 @Override @@ -61,27 +62,28 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { if (recharge.getRemark() == null || recharge.getRemark().toString().isEmpty()) { return Result.error("备注不能为空"); } - String jwcode = recharge.getJwcode().toString(); - String op = "recharge"; // 操作类型（根据实际业务定义，例如"recharge"表示充值） - String content = recharge.getRemark(); // 备注作为content参数 - String orderNo = UUID.randomUUID().toString().replace("-", ""); // 生成唯一订单号（去除横线） - - // 2. 构建接口URL及参数 - String apiUrl = "http://47.92.148.30:3003/mock/61/hljw/api/user/gold"; - UriComponentsBuilder urlBuilder = UriComponentsBuilder.fromHttpUrl(apiUrl) - .queryParam("jwcode", jwcode) - .queryParam("op", op) - .queryParam("gold", recharge.getPermanentBean()) - .queryParam("content", content) - .queryParam("order_no", orderNo); - - // 3. 发送GET请求 - ResponseEntity response = restTemplate.getForEntity(urlBuilder.toUriString(), String.class); - - // 4. 处理响应结果 - if (!response.getStatusCode().is2xxSuccessful()) { - return Result.error("远程接口调用失败，状态码：" + response.getStatusCodeValue()); - } + beanRechargeMapper1.add(recharge); +// String jwcode = recharge.getJwcode().toString(); +// String op = "recharge"; // 操作类型（根据实际业务定义，例如"recharge"表示充值） +// String content = recharge.getRemark(); // 备注作为content参数 +// String orderNo = UUID.randomUUID().toString().replace("-", ""); // 生成唯一订单号（去除横线） +// +// // 2. 构建接口URL及参数 +// String apiUrl = "http://47.92.148.30:3003/mock/61/hljw/api/user/gold"; +// UriComponentsBuilder urlBuilder = UriComponentsBuilder.fromHttpUrl(apiUrl) +// .queryParam("jwcode", jwcode) +// .queryParam("op", op) +// .queryParam("gold", recharge.getPermanentBean()) +// .queryParam("content", content) +// .queryParam("order_no", orderNo); +// +// // 3. 发送GET请求 +// ResponseEntity response = restTemplate.getForEntity(urlBuilder.toUriString(), String.class); +// +// // 4. 处理响应结果 +// if (!response.getStatusCode().is2xxSuccessful()) { +// return Result.error("远程接口调用失败，状态码：" + response.getStatusCodeValue()); +// } return Result.success("添加成功"); } catch (Exception e) { return Result.error("系统异常：" + e.getMessage()); @@ -93,7 +95,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { @Override public PageInfo selectBySystem(Integer pageNum, Integer pageSize, BeanRechargeInfo beanRechargeInfo){ PageHelper.startPage(pageNum, pageSize); - List beanRechargeInfos = beanRechargeMapper.selectBySystem(beanRechargeInfo); + List beanRechargeInfos = beanRechargeMapper2.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 deleted file mode 100644 index 762172f..0000000 --- a/src/main/resources/jindouMapper/BeanRechargeMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/jindouMapper/BeanRechargeMapper2.xml b/src/main/resources/jindouMapper/BeanRechargeMapper2.xml new file mode 100644 index 0000000..c24b04f --- /dev/null +++ b/src/main/resources/jindouMapper/BeanRechargeMapper2.xml @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/BeanRechargeMapper1.xml b/src/main/resources/mapper/BeanRechargeMapper1.xml new file mode 100644 index 0000000..8fd108d --- /dev/null +++ b/src/main/resources/mapper/BeanRechargeMapper1.xml @@ -0,0 +1,28 @@ + + + + + + + INSERT INTO audit + + jwcode, + buy_jd, + free_jd, + type, + admin_name, + remark, + audit_status + + VALUES + + #{jwcode}, + #{permanentBean}, + #{freeBean}, + 0, + #{adminName}, + #{remark}, + 0 + + + \ No newline at end of file