Browse Source

这是一次拉取

lihuilin/hotfix-20250810160509-余额地区传参
lihuilin 1 week ago
parent
commit
008a0dd4c5
  1. 12
      src/main/java/com/example/demo/controller/coin/ExportController.java
  2. 3
      src/main/java/com/example/demo/controller/coin/RechargeController.java
  3. 1
      src/main/java/com/example/demo/domain/vo/bean/BeanConsume.java
  4. 4
      src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java
  5. 2
      src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java
  6. 2
      src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java
  7. 85
      src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
  8. 16
      src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java
  9. 4
      src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
  10. 15
      src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java
  11. 4
      src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java
  12. 4
      src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java
  13. 14
      src/main/resources/application-dev.yml
  14. 10
      src/main/resources/application-prod.yml
  15. 20
      src/main/resources/application-test.yml
  16. 21
      src/main/resources/application.yml
  17. 2
      src/main/resources/jindouMapper/BeanConsumeMapper.xml
  18. 1
      src/main/resources/liveMapper/LiveMapper.xml

12
src/main/java/com/example/demo/controller/coin/ExportController.java

@ -10,12 +10,15 @@ import com.example.demo.domain.vo.coin.Result;
import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.coin.ExportExcelService;
import com.example.demo.service.coin.GoldDetailService; import com.example.demo.service.coin.GoldDetailService;
import com.example.demo.Export.ExportService; import com.example.demo.Export.ExportService;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.UUID; import java.util.UUID;
@ -57,6 +60,9 @@ public class ExportController {
String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key可按用户/业务区分 String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key可按用户/业务区分
String requestId = UUID.randomUUID().toString(); // 请求 ID防止误删锁 String requestId = UUID.randomUUID().toString(); // 请求 ID防止误删锁
long expireTime = 5000; // 锁过期时间5秒s long expireTime = 5000; // 锁过期时间5秒s
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("token");
dto.setToken(token);
try { try {
// 尝试获取锁 // 尝试获取锁
if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) { if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) {
@ -74,6 +80,9 @@ public class ExportController {
String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key可按用户/业务区分 String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key可按用户/业务区分
String requestId = UUID.randomUUID().toString(); // 请求 ID防止误删锁 String requestId = UUID.randomUUID().toString(); // 请求 ID防止误删锁
long expireTime = 5000; // 锁过期时间5秒s long expireTime = 5000; // 锁过期时间5秒s
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("token");
dto.setToken(token);
try { try {
// 尝试获取锁 // 尝试获取锁
if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) { if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) {
@ -91,6 +100,9 @@ public class ExportController {
String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key可按用户/业务区分 String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key可按用户/业务区分
String requestId = UUID.randomUUID().toString(); // 请求 ID防止误删锁 String requestId = UUID.randomUUID().toString(); // 请求 ID防止误删锁
long expireTime = 5000; // 锁过期时间5秒s long expireTime = 5000; // 锁过期时间5秒s
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("token");
dto.setToken(token);
try { try {
return exportService.addExportConsume(dto); return exportService.addExportConsume(dto);
} finally { } finally {

3
src/main/java/com/example/demo/controller/coin/RechargeController.java

@ -91,6 +91,7 @@ public class RechargeController {
return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser())); return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser()));
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return Result.error("请检查筛选数据的格式"); return Result.error("请检查筛选数据的格式");
} }
@ -105,7 +106,7 @@ public class RechargeController {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("token"); String token = request.getHeader("token");
Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
rechargeUser.setMarkets(markets); rechargeUser.setMarkets(markets);
} }
Gold gold = rechargeService.statsGold(rechargeUser); Gold gold = rechargeService.statsGold(rechargeUser);

1
src/main/java/com/example/demo/domain/vo/bean/BeanConsume.java

@ -18,6 +18,7 @@ import lombok.NoArgsConstructor;
public class BeanConsume { public class BeanConsume {
private Integer id;//id private Integer id;//id
private String jwcode; // 精网号 private String jwcode; // 精网号
private Integer total; //总金豆
private Integer freeBean; // 免费豆 private Integer freeBean; // 免费豆
private Integer permanentBean; // 永久豆 private Integer permanentBean; // 永久豆
private String remark; //备注 private String remark; //备注

4
src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java

@ -32,6 +32,10 @@ public class BeanConsumeFan {
private String dept; //地区/分部 private String dept; //地区/分部
@ExcelProperty("金豆数量") @ExcelProperty("金豆数量")
private String beanNum; //金豆数量 private String beanNum; //金豆数量
@ExcelProperty("免费金豆")
private String freeBean; //免费金豆
@ExcelProperty("付费金豆")
private String buyBean; //付费金豆
@ExcelProperty("频道名称") @ExcelProperty("频道名称")
private String channel; //频道名称source_name private String channel; //频道名称source_name
@ExcelProperty("消费方式") @ExcelProperty("消费方式")

2
src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java

@ -39,6 +39,8 @@ public class BeanConsumeLive {
private String type; //类型 private String type; //类型
@ExcelProperty("礼物名称") @ExcelProperty("礼物名称")
private String gift; //礼物名称 private String gift; //礼物名称
@ExcelProperty("是否为背包礼物")
private String isBackpack;
@ExcelProperty("金豆数量") @ExcelProperty("金豆数量")
private String beanNum; //金豆数量 private String beanNum; //金豆数量
@ExcelProperty("频道名称") @ExcelProperty("频道名称")

2
src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java

@ -51,7 +51,7 @@ public class BeanAuditServiceImpl implements BeanAuditService {
// 2. 构建接口URL及参数 // 2. 构建接口URL及参数
@Value("${bean.url}")
@Value("${bean.recharge.url}")
String apiUrl; String apiUrl;
//查找审核信息 //查找审核信息

85
src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java

@ -1,5 +1,6 @@
package com.example.demo.serviceImpl.bean; package com.example.demo.serviceImpl.bean;
import com.example.demo.Util.BaseDES2;
import com.example.demo.domain.vo.bean.*; import com.example.demo.domain.vo.bean.*;
import com.example.demo.domain.vo.coin.*; import com.example.demo.domain.vo.coin.*;
import com.example.demo.mapper.bean.BeanConsumeMapper; import com.example.demo.mapper.bean.BeanConsumeMapper;
@ -9,12 +10,20 @@ import com.example.demo.service.bean.BeanConsumeService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
/** /**
@ -35,7 +44,9 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
private UserMapper userMapper; private UserMapper userMapper;
@Autowired @Autowired
private RestTemplate restTemplate; private RestTemplate restTemplate;
// 构建接口URL及参数
@Value("${bean.consume.url}")
String apiUrl;
//获取消费用户分部 //获取消费用户分部
@Override @Override
@ -50,9 +61,10 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
return liveDeptList; return liveDeptList;
} }
//减少金豆 //减少金豆
@Transactional
@Override @Override
public Result reduce(BeanConsume consume) { public Result reduce(BeanConsume consume) {
try {
// 验证精网号是否有效 // 验证精网号是否有效
if (consume.getJwcode() == null || consume.getJwcode().isEmpty()) { if (consume.getJwcode() == null || consume.getJwcode().isEmpty()) {
return Result.error("精网号不能为空"); return Result.error("精网号不能为空");
@ -71,43 +83,60 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
return Result.error("免费豆和永久豆不能同时为0"); return Result.error("免费豆和永久豆不能同时为0");
} }
// 验证备注是否为空 // 验证备注是否为空
if (consume.getRemark() == null || consume.getRemark().toString().isEmpty()) {
if (consume.getRemark() == null || consume.getRemark().isEmpty()) {
return Result.error("备注不能为空"); return Result.error("备注不能为空");
} }
if(consume.getAdminName() == null || consume.getAdminName().toString().isEmpty()){
return Result.error("管理员名称不能为空");
}
GoldUser goldUser = userMapper.selectUser(consume.getJwcode().toString());
if(goldUser==null){
return Result.error("用户不存在");
String jwcode = consume.getJwcode();
//String jwcode = "1bf7194c2dc63c45cd834d35e38faa71";
try {
BaseDES2 d = new BaseDES2();
jwcode = d.encrypt(jwcode);
} catch (Exception e) {
return Result.error("加密失败");
} }
// String jwcode = consume.getJwcode();
String jwcode = "2e35cadd48a15cc4cd834d35e38faa71";
String op = "cost"; // 操作类型根据实际业务定义例如"recharge"表示充值
String content = consume.getRemark(); // 备注作为content参数 String content = consume.getRemark(); // 备注作为content参数
String orderNo = UUID.randomUUID().toString().replace("-", ""); // 生成唯一订单号去除横线
// 2. 构建接口URL及参数
String apiUrl = "http://39.101.133.168:8828/mock/61/hljw/api/user/gold";
UriComponentsBuilder urlBuilder = UriComponentsBuilder.fromHttpUrl(apiUrl)
.queryParam("jwcode", jwcode)
.queryParam("op", op)
.queryParam("gold", consume.getPermanentBean())
.queryParam("content", content)
.queryParam("order_no", orderNo);
// 3. 发送GET请求
ResponseEntity<String> response = restTemplate.getForEntity(urlBuilder.toUriString(), String.class);
// 2. 创建请求参数对象使用Map或自定义实体类
Map<String, String> params = new HashMap<>();
params.put("jwcode", jwcode);
int total = consume.getPermanentBean() + consume.getFreeBean();
params.put("total", String.valueOf(total));
params.put("buy", consume.getPermanentBean().toString());
params.put("free", consume.getFreeBean().toString());
params.put("content", content);
// 3. 构建请求头指定Content-Type为JSON
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); // 关键设置为JSON格式
// 4. 构建请求实体参数+头信息
HttpEntity<Map<String, String>> requestEntity = new HttpEntity<>(params, headers);
try {
// 5. 发送POST请求
ResponseEntity<String> response = restTemplate.postForEntity(
apiUrl,
requestEntity,
String.class
);
System.out.println("请求参数:" + params);
System.out.println("响应状态码:" + response.getStatusCodeValue());
System.out.println("响应内容:" + response.getBody());
// 4. 处理响应结果
if (!response.getStatusCode().is2xxSuccessful()) { if (!response.getStatusCode().is2xxSuccessful()) {
return Result.error("远程接口调用失败,状态码:" + response.getStatusCodeValue());
return Result.error("远程接口接口调用失败,状态码:" + response.getStatusCodeValue() + ",响应:" + response.getBody());
} }
return Result.success("减少成功");
} catch (Exception e) {
return Result.error("系统异常:" + e.getMessage());
} catch (RestClientException e) {
e.printStackTrace();
return Result.error("请求发送失败:" + e.getMessage());
} }
return Result.success();
} }
//筛选查询直播消费 //筛选查询直播消费
@Override @Override

16
src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java

@ -23,6 +23,7 @@ import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
@ -63,7 +64,10 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
if (recharge.getJwcode() == null || recharge.getJwcode().toString().isEmpty()) { if (recharge.getJwcode() == null || recharge.getJwcode().toString().isEmpty()) {
return Result.error("精网号不能为空"); return Result.error("精网号不能为空");
} }
if(recharge.getJwcode()<10000000||recharge.getJwcode()>99999999)
{
return Result.error("精网号位数小于8位或大于8位");
}
// 验证免费豆和永久豆是否为非负数 // 验证免费豆和永久豆是否为非负数
if (recharge.getFreeBean() < 0 || recharge.getPermanentBean() < 0) { if (recharge.getFreeBean() < 0 || recharge.getPermanentBean() < 0) {
return Result.error("免费豆和永久豆不能为负数"); return Result.error("免费豆和永久豆不能为负数");
@ -132,7 +136,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
// 初始化累加器 // 初始化累加器
int permanentGoldSum = 0; int permanentGoldSum = 0;
int freeGoldSum = 0; int freeGoldSum = 0;
Double moneySum = 0.0;
BigDecimal moneySum = new BigDecimal("0.0");
// 遍历充值记录并累加金币 // 遍历充值记录并累加金币
for (BeanSystemRechargeInfo info : beanSystemRechargeInfos) { for (BeanSystemRechargeInfo info : beanSystemRechargeInfos) {
@ -144,16 +148,12 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
if (info.getFreeBean() != null) { if (info.getFreeBean() != null) {
freeGoldSum += info.getFreeBean(); freeGoldSum += info.getFreeBean();
} }
// 累加金额
if (info.getMoney() != null) {
moneySum += info.getMoney();
}
} }
moneySum = new BigDecimal(permanentGoldSum).divide(new BigDecimal("50"), 2, RoundingMode.HALF_UP);
// 将累加结果设置到Gold对象 // 将累加结果设置到Gold对象
gold.setPermanentBean(permanentGoldSum); gold.setPermanentBean(permanentGoldSum);
gold.setFreeBean(freeGoldSum); gold.setFreeBean(freeGoldSum);
gold.setMoney(moneySum);
gold.setMoney(moneySum.doubleValue());
gold.setBeanNum(permanentGoldSum+freeGoldSum); gold.setBeanNum(permanentGoldSum+freeGoldSum);
return gold; return gold;
} }

4
src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

@ -116,6 +116,10 @@ public class ConsumeServiceImpl implements ConsumeService {
if (consumeUser.getTaskGold() < 0 || consumeUser.getFreeGold() < 0 || consumeUser.getPermanentGold() < 0) { if (consumeUser.getTaskGold() < 0 || consumeUser.getFreeGold() < 0 || consumeUser.getPermanentGold() < 0) {
return Result.error("金币不能为负数"); return Result.error("金币不能为负数");
} }
if(consumeUser.getJwcode()<10000000||consumeUser.getJwcode()>99999999)
{
return Result.error("精网号位数小于8位或大于8位");
}
GoldUser goldUser = userMapper.selectUser(consumeUser.getJwcode().toString()); GoldUser goldUser = userMapper.selectUser(consumeUser.getJwcode().toString());
if (goldUser == null) { if (goldUser == null) {
return Result.error("用户不存在"); return Result.error("用户不存在");

15
src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java

@ -125,7 +125,12 @@ public class ExportExcelServiceImpl implements ExportExcelService {
JsonNode rootNode = objectMapper.readTree(message); JsonNode rootNode = objectMapper.readTree(message);
JsonNode requestDataNode = rootNode.path("requestData"); JsonNode requestDataNode = rootNode.path("requestData");
JsonNode rechargeUserNode = requestDataNode.path("rechargeUser"); JsonNode rechargeUserNode = requestDataNode.path("rechargeUser");
JsonNode tokenNode = rootNode.path("token");
String token = tokenNode.asText();
RechargeUser rechargeUser = objectMapper.treeToValue(rechargeUserNode, RechargeUser.class); RechargeUser rechargeUser = objectMapper.treeToValue(rechargeUserNode, RechargeUser.class);
Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
rechargeUser.setMarkets(markets);
page.setRechargeUser(rechargeUser); page.setRechargeUser(rechargeUser);
return rechargeController.selcet(page); return rechargeController.selcet(page);
} catch (Exception e) { } catch (Exception e) {
@ -141,7 +146,12 @@ public class ExportExcelServiceImpl implements ExportExcelService {
JsonNode rootNode = objectMapper.readTree(message); JsonNode rootNode = objectMapper.readTree(message);
JsonNode requestDataNode = rootNode.path("requestData"); JsonNode requestDataNode = rootNode.path("requestData");
JsonNode consumeUserNode = requestDataNode.path("consumeUser"); JsonNode consumeUserNode = requestDataNode.path("consumeUser");
JsonNode tokenNode = rootNode.path("token");
String token = tokenNode.asText();
ConsumeUser consumeUser = objectMapper.treeToValue(consumeUserNode, ConsumeUser.class); ConsumeUser consumeUser = objectMapper.treeToValue(consumeUserNode, ConsumeUser.class);
Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
consumeUser.setMarkets(markets);
page.setConsumeUser(consumeUser); page.setConsumeUser(consumeUser);
return consumeController.select(page); return consumeController.select(page);
} catch (Exception e) { } catch (Exception e) {
@ -158,7 +168,12 @@ public class ExportExcelServiceImpl implements ExportExcelService {
JsonNode rootNode = objectMapper.readTree(message); JsonNode rootNode = objectMapper.readTree(message);
JsonNode requestDataNode = rootNode.path("requestData"); JsonNode requestDataNode = rootNode.path("requestData");
JsonNode refundUserNode = requestDataNode.path("refundUser"); JsonNode refundUserNode = requestDataNode.path("refundUser");
JsonNode tokenNode = rootNode.path("token");
String token = tokenNode.asText();
RefundUser refundUser = objectMapper.treeToValue(refundUserNode, RefundUser.class); RefundUser refundUser = objectMapper.treeToValue(refundUserNode, RefundUser.class);
Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
refundUser.setMarkets(markets);
page.setRefundUser(refundUser); page.setRefundUser(refundUser);
return refundController.selcet(page); return refundController.selcet(page);
} catch (Exception e) { } catch (Exception e) {

4
src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java

@ -103,6 +103,10 @@ public class RechargeServiceImpl implements RechargeService {
if(rechargeUser.getFreeGold()<0||rechargeUser.getPermanentGold()<0||rechargeUser.getMoney()<0){ if(rechargeUser.getFreeGold()<0||rechargeUser.getPermanentGold()<0||rechargeUser.getMoney()<0){
return Result.error("充值不能为0"); return Result.error("充值不能为0");
} }
if(rechargeUser.getJwcode()<10000000||rechargeUser.getJwcode()>99999999)
{
return Result.error("精网号位数小于8位或大于8位");
}
GoldUser goldUser = userMapper.selectUser(rechargeUser.getJwcode().toString()); GoldUser goldUser = userMapper.selectUser(rechargeUser.getJwcode().toString());
if(goldUser==null){ if(goldUser==null){
return Result.error("用户不存在"); return Result.error("用户不存在");

4
src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java

@ -112,6 +112,10 @@ public class RefundServiceImpl implements RefundService {
if (refundUser.getTaskGold() < 0 || refundUser.getFreeGold() < 0 || refundUser.getPermanentGold() < 0) { if (refundUser.getTaskGold() < 0 || refundUser.getFreeGold() < 0 || refundUser.getPermanentGold() < 0) {
return Result.error("金币不能为负数"); return Result.error("金币不能为负数");
} }
if(refundUser.getJwcode()<10000000||refundUser.getJwcode()>99999999)
{
return Result.error("精网号位数小于8位或大于8位");
}
GoldUser goldUser = userMapper.selectUser(refundUser.getJwcode().toString()); GoldUser goldUser = userMapper.selectUser(refundUser.getJwcode().toString());
if(goldUser==null){ if(goldUser==null){
return Result.error("用户不存在"); return Result.error("用户不存在");

14
src/main/resources/application-dev.yml

@ -12,9 +12,9 @@ spring:
pool-name: mysql1HikariCP pool-name: mysql1HikariCP
maximum-pool-size: 10 maximum-pool-size: 10
sqlserver1: sqlserver1:
jdbc-url: jdbc:sqlserver://54.255.120.171:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
username: newkst_test
password: ahsjdh#$gas6545
jdbc-url: jdbc:sqlserver://10.19.183.6:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
username: hwhc_gold_query
password: hwhc_gold_query4564jkj
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
application: application:
@ -52,12 +52,10 @@ feishu:
webhook: webhook:
url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877 url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877
bean: bean:
recharge:
# url: http://api.homilychart.com/hljwgo/api/wallet/recharge # url: http://api.homilychart.com/hljwgo/api/wallet/recharge
url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge
consume:
url: http://39.101.133.168:8828/hljwgo/api/wallet/pay
server: server:
port: 10704 port: 10704
logging:
level:
org.springframework.jdbc.core.JdbcTemplate: DEBUG
org.springframework.orm.jpa: DEBUG

10
src/main/resources/application-prod.yml

@ -12,7 +12,7 @@ spring:
pool-name: mysql1HikariCP pool-name: mysql1HikariCP
maximum-pool-size: 10 maximum-pool-size: 10
sqlserver1: sqlserver1:
jdbc-url: jdbc:sqlserver://52.76.43.43:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
jdbc-url: jdbc:sqlserver://10.19.183.6:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
username: hwhc_gold_query username: hwhc_gold_query
password: hwhc_gold_query4564jkj password: hwhc_gold_query4564jkj
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@ -54,13 +54,11 @@ feishu:
url: https://open.feishu.cn/open-apis/bot/v2/hook/1a515b19-b64f-46b7-9486-35842b9539fe url: https://open.feishu.cn/open-apis/bot/v2/hook/1a515b19-b64f-46b7-9486-35842b9539fe
bean: bean:
recharge:
# url: http://api.homilychart.com/hljwgo/api/wallet/recharge # url: http://api.homilychart.com/hljwgo/api/wallet/recharge
url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge
consume:
url: http://39.101.133.168:8828/hljwgo/api/wallet/pay
server: server:
port: 10704 port: 10704
logging:
level:
org.springframework.jdbc.core.JdbcTemplate: DEBUG
org.springframework.orm.jpa: DEBUG

20
src/main/resources/application-test.yml

@ -12,9 +12,9 @@ spring:
pool-name: mysql1HikariCP pool-name: mysql1HikariCP
maximum-pool-size: 10 maximum-pool-size: 10
sqlserver1: sqlserver1:
jdbc-url: jdbc:sqlserver://54.255.120.171:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
username: newkst_test
password: ahsjdh#$gas6545
jdbc-url: jdbc:sqlserver://10.19.183.6:1433;databaseName=hwhcGold;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
username: hwhc_gold_query
password: hwhc_gold_query4564jkj
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
application: application:
@ -35,16 +35,19 @@ spring:
data: data:
redis: redis:
database: 0 database: 0
host: localhost
port: 6379
password: 123456
host: 54.255.212.181
port: 10703
password: Ngc0FYUTA6h3wC5J
lettuce: lettuce:
pool: pool:
max-active: 20 max-active: 20
max-wait: -1 max-wait: -1
max-idle: 5 max-idle: 5
http://192:
168:
1:
50:8081:
file: file:
upload: upload:
url: http://39.101.133.168:8828/hljw/api/aws/upload url: http://39.101.133.168:8828/hljw/api/aws/upload
@ -52,8 +55,11 @@ feishu:
webhook: webhook:
url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877 url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877
bean: bean:
recharge:
# url: http://api.homilychart.com/hljwgo/api/wallet/recharge # url: http://api.homilychart.com/hljwgo/api/wallet/recharge
url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge
consume:
url: http://39.101.133.168:8828/hljwgo/api/wallet/pay
server: server:
port: 8081 port: 8081

21
src/main/resources/application.yml

@ -70,7 +70,7 @@ spring:
data: data:
redis: redis:
database: 0 database: 0
host: 18.143.76.3
host: 54.255.212.181
port: 10703 port: 10703
password: Ngc0FYUTA6h3wC5J password: Ngc0FYUTA6h3wC5J
@ -85,16 +85,16 @@ mybatis:
configuration: configuration:
mysql1: mysql1:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
sqlserver1: sqlserver1:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mysql2: mysql2:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mysql3: mysql3:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
upload: upload:
path: D:\upload path: D:\upload
@ -103,13 +103,16 @@ file:
upload: upload:
url: http://39.101.133.168:8828/hljw/api/aws/upload url: http://39.101.133.168:8828/hljw/api/aws/upload
bean: bean:
recharge:
# url: http://api.homilychart.com/hljwgo/api/wallet/recharge # url: http://api.homilychart.com/hljwgo/api/wallet/recharge
url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge
consume:
url: http://39.101.133.168:8828/hljwgo/api/wallet/pay
server: server:
port: 8081 port: 8081
logging:
level:
org.springframework.jdbc.core.JdbcTemplate: DEBUG
org.springframework.orm.jpa: DEBUG
# logging:
# level:
# org.springframework.jdbc.core.JdbcTemplate: DEBUG
# org.springframework.orm.jpa: DEBUG

2
src/main/resources/jindouMapper/BeanConsumeMapper.xml

@ -129,6 +129,8 @@
fm.jwcode, fm.jwcode,
fm.dept, fm.dept,
fyr.money AS beanNum, fyr.money AS beanNum,
fyr.money_free AS freeBean,
fyr.money_buy AS buyBean,
fyr.source_name AS channel, fyr.source_name AS channel,
fyr.source_type AS type, fyr.source_type AS type,
FROM_UNIXTIME(fyr.time, '%Y-%m-%d %H:%i:%s') AS consumeTime, FROM_UNIXTIME(fyr.time, '%Y-%m-%d %H:%i:%s') AS consumeTime,

1
src/main/resources/liveMapper/LiveMapper.xml

@ -9,6 +9,7 @@
lgg.jwcode as jwcode, lgg.jwcode as jwcode,
mi.deptName as dept, mi.deptName as dept,
lg.name as gift, lg.name as gift,
lgg.knapsack as isBackpack,
lgg.gold_beans as beanNum, lgg.gold_beans as beanNum,
lgg.gold_free as freeBean, lgg.gold_free as freeBean,
lgg.gold_buy as buyBean, lgg.gold_buy as buyBean,

Loading…
Cancel
Save