diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index fb0cb06..205be0b 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -143,15 +143,16 @@ public class MysqlServiceImpl implements MysqlService { if (operation_platform.equals("1")){ mysqlStmt.setString(8, "ERP"); } - if (operation_platform.equals("2")){ + else if (operation_platform.equals("2")){ mysqlStmt.setString(8, "HomilyLink"); } - if(operation_platform.equals("3")){ + else if(operation_platform.equals("3")){ mysqlStmt.setString(8, "HomilyChart"); } - if(operation_platform.equals("4")){ + else if(operation_platform.equals("4")){ continue; - }if(operation_platform.equals("0")){ + } + else if(operation_platform.equals("0")){ mysqlStmt.setString(8, "初始化金币"); } else { 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 3dd0e65..1bd9bbd 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 @@ -34,7 +34,7 @@ public class BeanRechargeInfo { private String market; // 所属地区 @ExcelProperty("免费金豆") private Integer freeBean; // 免费豆 - @ExcelProperty("永久金豆") + @ExcelProperty("付费金豆") private Integer permanentBean; // 永久豆 @ExcelProperty("金额") private Double money; // 金额 diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java index c76346d..f7e0f04 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java @@ -34,7 +34,7 @@ public class BeanSystemRechargeInfo { private String market; // 所属地区 @ExcelProperty("免费金豆") private Integer freeBean; // 免费豆 - @ExcelProperty("永久金豆") + @ExcelProperty("付费金豆") private Integer permanentBean; // 永久豆 @ExcelProperty("金额") private Double money; // 金额 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 a3b1724..d911b91 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -68,14 +68,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { @Override public Result reduce(BeanConsume consume) { - //获取用户当前余额 - BeanUserCard user= beanUserMapper.userCard(consume.getJwcode()); - if (user.getFreeBean() < consume.getFreeBean()) { - return Result.error("用户免费金豆余额不足"); - } - if (user.getPermanentBean() < consume.getPermanentBean()) { - return Result.error("用户永久金豆余额不足"); - } + // 验证精网号是否有效 if (consume.getJwcode() == null || consume.getJwcode().isEmpty()) { return Result.error("精网号不能为空"); @@ -93,6 +86,14 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { if (consume.getFreeBean() == 0 && consume.getPermanentBean() == 0) { return Result.error("免费豆和永久豆不能同时为0"); } + //获取用户当前余额 + BeanUserCard user= beanUserMapper.userCard(consume.getJwcode()); + if (user.getFreeBean() < consume.getFreeBean()) { + return Result.error("用户免费金豆余额不足"); + } + if (user.getPermanentBean() < consume.getPermanentBean()) { + return Result.error("用户永久金豆余额不足"); + } // 验证备注是否为空 if (consume.getRemark() == null || consume.getRemark().isEmpty()) { return Result.error("备注不能为空"); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index c814028..fe239b6 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -142,6 +142,9 @@ public class AuditServiceImpl implements AuditService { public PageInfo selectRechargeBy(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit) { List markets = marketMapper.getMarketIds(rechargeAudit.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } rechargeAudit.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List rechargeAudits = auditMapper.selectRechargeBy(pageNum, pageSize, rechargeAudit); @@ -156,6 +159,9 @@ public class AuditServiceImpl implements AuditService { List markets = marketMapper.getMarketIds(refundAudit.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } refundAudit.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); @@ -173,6 +179,9 @@ public class AuditServiceImpl implements AuditService { //获取充值审核订单列表 List markets = marketMapper.getMarketIds(rechargeAudit.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } rechargeAudit.setMarkets(markets); List rechargeAudits = auditMapper.selectRechargeBy(1, 500000, rechargeAudit); // 初始化累加器 @@ -209,6 +218,9 @@ public class AuditServiceImpl implements AuditService { //获取充值审核订单列表 List markets = marketMapper.getMarketIds(refundAudit.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } refundAudit.setMarkets(markets); List refundAudits = auditMapper.selectRefundBy(1, 500000, refundAudit); // 初始化累加器 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 d572177..8b53daa 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -62,6 +62,9 @@ public class ConsumeServiceImpl implements ConsumeService { public Gold statsGold(ConsumeUser consumeUser) { //获取市场id List markets = marketMapper.getMarketIds(consumeUser.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } consumeUser.setMarkets(markets); Gold gold = new Gold(); List consumeUsers = consumeMapper.selectBy(consumeUser); @@ -100,6 +103,9 @@ public class ConsumeServiceImpl implements ConsumeService { public PageInfo selectBy(Integer pageNum, Integer pageSize, ConsumeUser consumeUser) { //获取市场id List markets = marketMapper.getMarketIds(consumeUser.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } consumeUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List consumeUsers = consumeMapper.selectBy(consumeUser); 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 d967cb6..6ca8f3a 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -61,6 +61,9 @@ public class RechargeServiceImpl implements RechargeService { @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, RechargeUser rechargeUser) throws Exception{ List markets = marketMapper.getMarketIds(rechargeUser.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } rechargeUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List rechargeUsers = rechargeMapper.selectBy(rechargeUser); @@ -71,6 +74,10 @@ public class RechargeServiceImpl implements RechargeService { @Override public Gold statsGold(RechargeUser rechargeUser) { List markets = marketMapper.getMarketIds(rechargeUser.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + + } rechargeUser.setMarkets(markets); Gold gold = new Gold(); List rechargeUsers = rechargeMapper.selectBy(rechargeUser); @@ -112,7 +119,10 @@ public class RechargeServiceImpl implements RechargeService { { return Result.error("精网号位数小于8位或大于8位"); } - + // 验证免费金币和永久金币是否均为0 + if (rechargeUser.getFreeGold() == 0 && rechargeUser.getPermanentGold() == 0) { + return Result.error("免费金币和永久金币不能同时为0"); + } BeanUserCard user = beanUserMapper.userCard(String.valueOf(rechargeUser.getJwcode())); if(user==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 c5f1e14..9b88b64 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -59,6 +59,9 @@ public class RefundServiceImpl implements RefundService { @Override public Gold statsGold(RefundUser refundUser) { List markets = marketMapper.getMarketIds(refundUser.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } refundUser.setMarkets(markets); Gold gold = new Gold(); List refundUsers = refundMapper.selectBy(refundUser); @@ -96,6 +99,9 @@ public class RefundServiceImpl implements RefundService { @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, RefundUser refundUser)throws Exception { List markets = marketMapper.getMarketIds(refundUser.getMarkets()); + if (markets.contains("9") || markets.contains("9999")){ + markets=null; + } refundUser.setMarkets(markets); PageHelper.startPage(pageNum, pageSize); List refundUsers = refundMapper.selectBy(refundUser); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 451a575..5855c38 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,17 +12,17 @@ spring: pool-name: mysql1HikariCP maximum-pool-size: 10 mysql2: - jdbc-url: jdbc:mysql://52.220.141.241:3306/hljw?serverTimezone=Asia/Shanghai - username: gold_coin - password: NaVILnQottaWpMTw0o + jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai + username: hljw + password: 5dmWCCKfEk3TTeyn driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql2HikariCP maximum-pool-size: 10 mysql3: - jdbc-url: jdbc:mysql://52.220.141.241:3306/pay?serverTimezone=Asia/Shanghai - username: gold_coin - password: NaVILnQottaWpMTw0o + jdbc-url: jdbc:mysql://121.89.234.155:3306/pay_xxcg_com?serverTimezone=Asia/Shanghai + username: pay_xxcg_com + password: 4hHmzxZH4rF4c5xr driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql3HikariCP @@ -36,9 +36,9 @@ spring: pool-name: mysql3HikariCP maximum-pool-size: 10 mysql5: - jdbc-url: jdbc:mysql://52.220.141.241:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true - username: gold_coin - password: NaVILnQottaWpMTw0o + jdbc-url: jdbc:mysql://39.101.133.168:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true + username: live + password: p4jMAMShNM8HTrbX driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql5HikariCP diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 6b0cecc..036401a 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -12,17 +12,17 @@ spring: pool-name: mysql1HikariCP maximum-pool-size: 10 mysql2: - jdbc-url: jdbc:mysql://39.101.133.168:3306/hljw?serverTimezone=Asia/Shanghai - username: hljw - password: 5dmWCCKfEk3TTeyn + jdbc-url: jdbc:mysql://52.220.141.241:3306/hljw?serverTimezone=Asia/Shanghai + username: gold_coin + password: NaVILnQottaWpMTw0o driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql2HikariCP maximum-pool-size: 10 mysql3: - jdbc-url: jdbc:mysql://121.89.234.155:3306/pay_xxcg_com?serverTimezone=Asia/Shanghai - username: pay_xxcg_com - password: 4hHmzxZH4rF4c5xr + jdbc-url: jdbc:mysql://52.220.141.241:3306/pay?serverTimezone=Asia/Shanghai + username: gold_coin + password: NaVILnQottaWpMTw0o driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql3HikariCP @@ -36,9 +36,9 @@ spring: pool-name: mysql3HikariCP maximum-pool-size: 10 mysql5: - jdbc-url: jdbc:mysql://39.101.133.168:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true - username: live - password: p4jMAMShNM8HTrbX + jdbc-url: jdbc:mysql://52.220.141.241:3306/live?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true + username: gold_coin + password: NaVILnQottaWpMTw0o driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: mysql5HikariCP @@ -49,6 +49,7 @@ spring: password: hwhc_gold_query4564jkj driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + application: name: demo cache: @@ -87,10 +88,9 @@ feishu: bean: recharge: - # url: http://api.homilychart.com/hljwgo/api/wallet/recharge - url: http://39.101.133.168:8828/hljwgo/api/wallet/recharge + url: http://api.homilychart.com/hljwgo/api/wallet/recharge consume: - url: http://39.101.133.168:8828/hljwgo/api/wallet/pay + url: http://api.homilychart.com/hljwgo/api/wallet/pay server: - port: 10704 + port: 10705 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 0bd95af..d1ecfaa 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -67,9 +67,9 @@ spring: data: redis: database: 0 - host: 54.255.212.181 - port: 10703 - password: Ngc0FYUTA6h3wC5J + host: localhost + port: 6379 + password: 123456 lettuce: pool: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 151cfba..f11474f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -52,7 +52,7 @@ 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 diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index 23a7c65..6130efb 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -287,13 +287,13 @@ AND fm.dept = #{beanConsumeArticle.dept} - AND fyr.source_name =#{beanConsumeArticle.articleName} + AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%') AND (SELECT fm2.nickname FROM fx_member fm2 WHERE fm2.jwcode = fyr.source_jwcode - LIMIT 1)=#{beanConsumeArticle.author} + LIMIT 1)LIKE CONCAT('%',#{beanConsumeArticle.author}, '%') AND fyr.source_id =#{beanConsumeArticle.articleId} diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 17718a8..3e9badf 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -63,7 +63,7 @@ AND ugr.activity = #{rechargeAudit.activity} - + AND ( u.market = #{market} @@ -124,7 +124,7 @@ - + AND ( u.market = #{market} diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index a3e63b8..99dc5e6 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -95,12 +95,11 @@ ugr.type = 1 AND ugr.flag = 1 - - AND ( - - u.market = #{market} + + AND u.market IN + + #{market} - ) AND ugr.jwcode = #{jwcode} diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index 55676db..cfe31e4 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -62,7 +62,7 @@ AND user.market IN - + #{market} @@ -73,13 +73,22 @@ SELECT - name AS "name", - jwcode AS "jwcode", - market AS "market", - (COALESCE(current_permanent_gold, 0) + COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0) + COALESCE(current_task_gold, 0)) AS "nowSumGold", - current_permanent_gold AS "nowPermanentGold", - (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "nowFreeGold", - current_task_gold AS "nowTaskGold", - (COALESCE(sum_permanent_gold, 0) + COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0) + COALESCE(sum_task_gold, 0)) AS "historySumGold", - sum_permanent_gold AS "historyPermanentGold", - (COALESCE(sum_free_june, 0) + COALESCE(sum_free_december, 0)) AS "historyFreeGold", - sum_task_gold AS "historyTaskGold", - recharge_num AS "rechargeNum", - consume_num AS "consumeNum", - first_recharge AS "firstRecharge" - FROM user + u.name AS "name", + u.jwcode AS "jwcode", + m.name AS "market", + (COALESCE(u.current_permanent_gold, 0) + COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0) + COALESCE(u.current_task_gold, 0)) AS "nowSumGold", + u.current_permanent_gold AS "nowPermanentGold", + (COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0)) AS "nowFreeGold", + u.current_task_gold AS "nowTaskGold", + (COALESCE(u.sum_permanent_gold, 0) + COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0) + COALESCE(u.sum_task_gold, 0)) AS "historySumGold", + u.sum_permanent_gold AS "historyPermanentGold", + (COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0)) AS "historyFreeGold", + u.sum_task_gold AS "historyTaskGold", + u.recharge_num AS "rechargeNum", + u.consume_num AS "consumeNum", + u.first_recharge AS "firstRecharge" + FROM user u + LEFT JOIN market m on u.market = m.id jwcode = #{jwcode}