diff --git a/src/main/java/com/example/demo/controller/coin/ExportController.java b/src/main/java/com/example/demo/controller/coin/ExportController.java index a425c2a..d6e120f 100644 --- a/src/main/java/com/example/demo/controller/coin/ExportController.java +++ b/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.GoldDetailService; import com.example.demo.Export.ExportService; +import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import java.util.UUID; @@ -57,6 +60,9 @@ public class ExportController { String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key(可按用户/业务区分) String requestId = UUID.randomUUID().toString(); // 请求 ID(防止误删锁) long expireTime = 5000; // 锁过期时间(5秒)s + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + dto.setToken(token); try { // 尝试获取锁 if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) { @@ -74,6 +80,9 @@ public class ExportController { String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key(可按用户/业务区分) String requestId = UUID.randomUUID().toString(); // 请求 ID(防止误删锁) long expireTime = 5000; // 锁过期时间(5秒)s + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + dto.setToken(token); try { // 尝试获取锁 if (!redisLockUtil.tryLock(lockKey, requestId, expireTime)) { @@ -91,6 +100,9 @@ public class ExportController { String lockKey = "export:lock:" + dto.getToken(); // 锁的 Key(可按用户/业务区分) String requestId = UUID.randomUUID().toString(); // 请求 ID(防止误删锁) long expireTime = 5000; // 锁过期时间(5秒)s + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = request.getHeader("token"); + dto.setToken(token); try { return exportService.addExportConsume(dto); } finally { diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java index 08c00b1..5c19f0b 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/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())); } } catch (Exception e) { + e.printStackTrace(); return Result.error("请检查筛选数据的格式"); } @@ -105,7 +106,7 @@ public class RechargeController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); - List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));; + List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); rechargeUser.setMarkets(markets); } Gold gold = rechargeService.statsGold(rechargeUser); diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsume.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsume.java index 2ae8f76..911244a 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsume.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsume.java @@ -18,6 +18,7 @@ import lombok.NoArgsConstructor; public class BeanConsume { private Integer id;//id private String jwcode; // 精网号 + private Integer total; //总金豆 private Integer freeBean; // 免费豆 private Integer permanentBean; // 永久豆 private String remark; //备注 diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java index f36a2d9..22c4598 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java @@ -32,6 +32,10 @@ public class BeanConsumeFan { private String dept; //地区/分部 @ExcelProperty("金豆数量") private String beanNum; //金豆数量 + @ExcelProperty("免费金豆") + private String freeBean; //免费金豆 + @ExcelProperty("付费金豆") + private String buyBean; //付费金豆 @ExcelProperty("频道名称") private String channel; //频道名称(source_name) @ExcelProperty("消费方式") diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java index c5c3195..33c52eb 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java @@ -39,6 +39,8 @@ public class BeanConsumeLive { private String type; //类型 @ExcelProperty("礼物名称") private String gift; //礼物名称 + @ExcelProperty("是否为背包礼物") + private String isBackpack; @ExcelProperty("金豆数量") private String beanNum; //金豆数量 @ExcelProperty("频道名称") diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java index 21625a7..3d3af4b 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java @@ -51,7 +51,7 @@ public class BeanAuditServiceImpl implements BeanAuditService { // 2. 构建接口URL及参数 - @Value("${bean.url}") + @Value("${bean.recharge.url}") String apiUrl; //查找审核信息 diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index 15bcf5f..e97675c 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -1,5 +1,6 @@ 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.coin.*; 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.PageInfo; 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.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.UUID; /** @@ -35,7 +44,9 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { private UserMapper userMapper; @Autowired private RestTemplate restTemplate; - + // 构建接口URL及参数 + @Value("${bean.consume.url}") + String apiUrl; //获取消费用户分部 @Override @@ -50,9 +61,10 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { return liveDeptList; } //减少金豆 + @Transactional @Override public Result reduce(BeanConsume consume) { - try { + // 验证精网号是否有效 if (consume.getJwcode() == null || consume.getJwcode().isEmpty()) { return Result.error("精网号不能为空"); @@ -71,42 +83,59 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { return Result.error("免费豆和永久豆不能同时为0"); } // 验证备注是否为空 - if (consume.getRemark() == null || consume.getRemark().toString().isEmpty()) { + if (consume.getRemark() == null || consume.getRemark().isEmpty()) { 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 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 response = restTemplate.getForEntity(urlBuilder.toUriString(), String.class); - - // 4. 处理响应结果 - if (!response.getStatusCode().is2xxSuccessful()) { - return Result.error("远程接口调用失败,状态码:" + response.getStatusCodeValue()); + + + // 2. 创建请求参数对象(使用Map或自定义实体类) + Map 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> requestEntity = new HttpEntity<>(params, headers); + + try { + // 5. 发送POST请求 + ResponseEntity response = restTemplate.postForEntity( + apiUrl, + requestEntity, + String.class + ); + + System.out.println("请求参数:" + params); + System.out.println("响应状态码:" + response.getStatusCodeValue()); + System.out.println("响应内容:" + response.getBody()); + + if (!response.getStatusCode().is2xxSuccessful()) { + return Result.error("远程接口接口调用失败,状态码:" + response.getStatusCodeValue() + ",响应:" + response.getBody()); + } + } catch (RestClientException e) { + e.printStackTrace(); + return Result.error("请求发送失败:" + e.getMessage()); } - return Result.success("减少成功"); - } catch (Exception e) { - return Result.error("系统异常:" + e.getMessage()); - } + + return Result.success(); + } //筛选查询直播消费 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 361f886..b99ac56 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/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 java.math.BigDecimal; +import java.math.RoundingMode; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -63,7 +64,10 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { if (recharge.getJwcode() == null || recharge.getJwcode().toString().isEmpty()) { return Result.error("精网号不能为空"); } - + if(recharge.getJwcode()<10000000||recharge.getJwcode()>99999999) + { + return Result.error("精网号位数小于8位或大于8位"); + } // 验证免费豆和永久豆是否为非负数 if (recharge.getFreeBean() < 0 || recharge.getPermanentBean() < 0) { return Result.error("免费豆和永久豆不能为负数"); @@ -132,7 +136,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { // 初始化累加器 int permanentGoldSum = 0; int freeGoldSum = 0; - Double moneySum = 0.0; + BigDecimal moneySum = new BigDecimal("0.0"); // 遍历充值记录并累加金币 for (BeanSystemRechargeInfo info : beanSystemRechargeInfos) { @@ -144,16 +148,12 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { if (info.getFreeBean() != null) { freeGoldSum += info.getFreeBean(); } - // 累加金额 - if (info.getMoney() != null) { - moneySum += info.getMoney(); - } } - + moneySum = new BigDecimal(permanentGoldSum).divide(new BigDecimal("50"), 2, RoundingMode.HALF_UP); // 将累加结果设置到Gold对象 gold.setPermanentBean(permanentGoldSum); gold.setFreeBean(freeGoldSum); - gold.setMoney(moneySum); + gold.setMoney(moneySum.doubleValue()); gold.setBeanNum(permanentGoldSum+freeGoldSum); return gold; } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index 48b1e51..d572177 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/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) { return Result.error("金币不能为负数"); } + if(consumeUser.getJwcode()<10000000||consumeUser.getJwcode()>99999999) + { + return Result.error("精网号位数小于8位或大于8位"); + } GoldUser goldUser = userMapper.selectUser(consumeUser.getJwcode().toString()); if (goldUser == null) { return Result.error("用户不存在"); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index f3f112c..b40cbcf 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/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 requestDataNode = rootNode.path("requestData"); JsonNode rechargeUserNode = requestDataNode.path("rechargeUser"); + JsonNode tokenNode = rootNode.path("token"); + String token = tokenNode.asText(); RechargeUser rechargeUser = objectMapper.treeToValue(rechargeUserNode, RechargeUser.class); + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); + rechargeUser.setMarkets(markets); page.setRechargeUser(rechargeUser); return rechargeController.selcet(page); } catch (Exception e) { @@ -141,7 +146,12 @@ public class ExportExcelServiceImpl implements ExportExcelService { JsonNode rootNode = objectMapper.readTree(message); JsonNode requestDataNode = rootNode.path("requestData"); JsonNode consumeUserNode = requestDataNode.path("consumeUser"); + JsonNode tokenNode = rootNode.path("token"); + String token = tokenNode.asText(); ConsumeUser consumeUser = objectMapper.treeToValue(consumeUserNode, ConsumeUser.class); + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); + consumeUser.setMarkets(markets); page.setConsumeUser(consumeUser); return consumeController.select(page); } catch (Exception e) { @@ -158,7 +168,12 @@ public class ExportExcelServiceImpl implements ExportExcelService { JsonNode rootNode = objectMapper.readTree(message); JsonNode requestDataNode = rootNode.path("requestData"); JsonNode refundUserNode = requestDataNode.path("refundUser"); + JsonNode tokenNode = rootNode.path("token"); + String token = tokenNode.asText(); RefundUser refundUser = objectMapper.treeToValue(refundUserNode, RefundUser.class); + Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); + List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); + refundUser.setMarkets(markets); page.setRefundUser(refundUser); return refundController.selcet(page); } catch (Exception e) { diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index c9aba5a..2f823f7 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/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){ return Result.error("充值不能为0"); } + if(rechargeUser.getJwcode()<10000000||rechargeUser.getJwcode()>99999999) + { + return Result.error("精网号位数小于8位或大于8位"); + } GoldUser goldUser = userMapper.selectUser(rechargeUser.getJwcode().toString()); if(goldUser==null){ return Result.error("用户不存在"); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index e1bc5b7..c5f1e14 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/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) { return Result.error("金币不能为负数"); } + if(refundUser.getJwcode()<10000000||refundUser.getJwcode()>99999999) + { + return Result.error("精网号位数小于8位或大于8位"); + } GoldUser goldUser = userMapper.selectUser(refundUser.getJwcode().toString()); if(goldUser==null){ return Result.error("用户不存在"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6cd6553..6dbb6d6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,9 +12,9 @@ spring: pool-name: mysql1HikariCP maximum-pool-size: 10 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 application: @@ -52,12 +52,10 @@ feishu: webhook: url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877 bean: + 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: port: 10704 - - logging: - level: - org.springframework.jdbc.core.JdbcTemplate: DEBUG - org.springframework.orm.jpa: DEBUG \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 3b84df9..02eab97 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -12,7 +12,7 @@ spring: pool-name: mysql1HikariCP maximum-pool-size: 10 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 password: hwhc_gold_query4564jkj 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 bean: + 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: port: 10704 - - logging: - level: - org.springframework.jdbc.core.JdbcTemplate: DEBUG - org.springframework.orm.jpa: DEBUG \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index e6ac979..df574ea 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -12,9 +12,9 @@ spring: pool-name: mysql1HikariCP maximum-pool-size: 10 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 application: @@ -35,16 +35,19 @@ spring: data: redis: database: 0 - host: localhost - port: 6379 - password: 123456 + host: 54.255.212.181 + port: 10703 + password: Ngc0FYUTA6h3wC5J lettuce: pool: max-active: 20 max-wait: -1 max-idle: 5 - +http://192: + 168: + 1: + 50:8081: file: upload: url: http://39.101.133.168:8828/hljw/api/aws/upload @@ -52,8 +55,11 @@ feishu: webhook: url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877 bean: + 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: port: 8081 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2784550..d4dabb8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -70,7 +70,7 @@ spring: data: redis: database: 0 - host: 18.143.76.3 + host: 54.255.212.181 port: 10703 password: Ngc0FYUTA6h3wC5J @@ -85,16 +85,16 @@ mybatis: configuration: mysql1: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl sqlserver1: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mysql2: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mysql3: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl upload: path: D:\upload @@ -103,13 +103,16 @@ file: upload: url: http://39.101.133.168:8828/hljw/api/aws/upload bean: + 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: port: 8081 - logging: - level: - org.springframework.jdbc.core.JdbcTemplate: DEBUG - org.springframework.orm.jpa: DEBUG \ No newline at end of file +# logging: +# level: +# org.springframework.jdbc.core.JdbcTemplate: DEBUG +# org.springframework.orm.jpa: DEBUG \ No newline at end of file diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index 624e158..1f2b051 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -129,6 +129,8 @@ fm.jwcode, fm.dept, fyr.money AS beanNum, + fyr.money_free AS freeBean, + fyr.money_buy AS buyBean, fyr.source_name AS channel, fyr.source_type AS type, FROM_UNIXTIME(fyr.time, '%Y-%m-%d %H:%i:%s') AS consumeTime, diff --git a/src/main/resources/liveMapper/LiveMapper.xml b/src/main/resources/liveMapper/LiveMapper.xml index 1f02287..9d5d10f 100644 --- a/src/main/resources/liveMapper/LiveMapper.xml +++ b/src/main/resources/liveMapper/LiveMapper.xml @@ -9,6 +9,7 @@ lgg.jwcode as jwcode, mi.deptName as dept, lg.name as gift, + lgg.knapsack as isBackpack, lgg.gold_beans as beanNum, lgg.gold_free as freeBean, lgg.gold_buy as buyBean,