From 1e532cbcd02dd65614cb1cf74ac3be476408a7fe Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Wed, 22 Oct 2025 11:00:15 +0800 Subject: [PATCH] =?UTF-8?q?10.20=20=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E4=B8=8E=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/Mysql/MysqlServiceImpl.java | 20 +++++++++++++---- src/main/java/com/example/demo/Util/BaseDES.java | 2 +- .../demo/domain/vo/cash/CashRecordDone.java | 1 + .../com/example/demo/mapper/coin/MarketMapper.java | 2 +- .../example/demo/service/coin/MarketService.java | 2 +- .../demo/serviceImpl/coin/MarketServiceImpl.java | 6 +++--- src/main/resources/application-prod.yml | 1 + src/main/resources/cashMapper/CashRefundMapper.xml | 25 ++++++++++++++++------ src/main/resources/mapper/MarketMapper.xml | 4 ++-- 9 files changed, 45 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 119e366..45b11c7 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -347,10 +347,8 @@ public class MysqlServiceImpl implements MysqlService { Map dataMap = (Map) responseBody.get("data"); if (dataMap != null) { name = (String) dataMap.get("name"); - Object countryObj = dataMap.get("country"); - if (countryObj instanceof List) { - country = (String) countryObj; - } + country = getCountryWithDefault(dataMap, "未知"); + logger.info("获取用户信息成功: name={}, country={}", name, country); } } @@ -424,5 +422,19 @@ public class MysqlServiceImpl implements MysqlService { } } } + private String getCountryWithDefault(Map dataMap, String defaultValue) { + Object countryObj = dataMap.get("treelist"); + + if (countryObj instanceof String) { + String countryStr = ((String) countryObj).trim(); + if (countryStr.isEmpty()) { + return defaultValue; + } + String[] parts = countryStr.split("-"); + return parts.length >= 3 ? parts[2] : defaultValue; + } + + return defaultValue; + } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/Util/BaseDES.java b/src/main/java/com/example/demo/Util/BaseDES.java index 933305a..5b013bf 100644 --- a/src/main/java/com/example/demo/Util/BaseDES.java +++ b/src/main/java/com/example/demo/Util/BaseDES.java @@ -91,7 +91,7 @@ public class BaseDES { public static void main(String args[]) { try { BaseDES d = new BaseDES(); - String encryptedText = d.encrypt("90048144"); + String encryptedText = d.encrypt("90048169"); System.out.println("加密结果：" + encryptedText); System.out.println("加密字符串：90005179》"+d.encrypt("90005179")); System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff")); diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java index 1faa9fc..928eafd 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java @@ -35,6 +35,7 @@ public class CashRecordDone { private String bankCode; /** 商品名称 */ private String goodsName; + private List goodsNames; /** 币种 */ private String paymentCurrency; /** 金额 */ diff --git a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java index 4629817..9102db8 100644 --- a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java @@ -12,6 +12,6 @@ public interface MarketMapper { //获取单个市场id String getMarketId(String market); - Market getMarketIdDao(String market); + Market getMarketIdDao(String country); Market getMarketIdBytype(String market); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/coin/MarketService.java b/src/main/java/com/example/demo/service/coin/MarketService.java index db7a9ca..21d03a0 100644 --- a/src/main/java/com/example/demo/service/coin/MarketService.java +++ b/src/main/java/com/example/demo/service/coin/MarketService.java @@ -18,5 +18,5 @@ public interface MarketService { //获取市场id List getMarketIds(List list); //dao获取市场id - String getMarketIdsDao(String market); + String getMarketIdsDao(String country); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java index b8211f6..c62b225 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java @@ -47,16 +47,16 @@ public class MarketServiceImpl implements MarketService { } @Override - public String getMarketIdsDao(String market) { + public String getMarketIdsDao(String country) { // 1. 参数验证 - if (market == null || market.trim().isEmpty()) { + if (country == null || country.trim().isEmpty()) { return "24030"; } try { // 2. 查询市场信息 - Market marketObj = marketMapper.getMarketIdDao(market.trim()); + Market marketObj = marketMapper.getMarketIdDao(country); // 3. 空值检查 if (marketObj == null) { diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 23eaeef..2ec3883 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -46,6 +46,7 @@ spring: maximum-pool-size: 10 sqlserver1: jdbc-url: jdbc:sqlserver://10.19.183.6:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; +# jdbc-url: jdbc:sqlserver://52.76.43.43:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true; username: gjb_test password: qweuio!@#$2 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index c80ae10..87c6e61 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -156,9 +156,9 @@ cr.goods_name, cr.good_num, cr.payment_currency, - Round((payment_amount) / 100.0, 2) AS freeGold, + Round((payment_amount) / 100.0, 2) AS PaymentAmount, cr.received_currency, - Round((received_amount) / 100.0, 2) AS freeGold, + Round((received_amount) / 100.0, 2) AS receivedAmount, cr.handling_charge, cr.pay_type, cr.received_market, @@ -186,6 +186,8 @@ a2.area_finance, a2.area_charge, a2.head_finance, + cr.refund_currency, + cr.refund_amount, m.name as marketName from cash_record cr left join admin a1 on submitter_id = a1.id @@ -219,12 +221,15 @@ - AND cr.payment_currency = #{paymentCurrency} + AND cr.payment_currency LIKE CONCAT('%', #{paymentCurrency}, '%') - - and cr.goods_name = #{goodsName} - + + AND cr.goods_name IN + + #{goodsNames} + + and cr.pay_type = #{payType} @@ -238,5 +243,13 @@ and cr.submitter_id = #{submitterId} + + + ORDER BY ${sortField} ${sortOrder} + + + ORDER BY create_time DESC + + \ No newline at end of file diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml index eb13c18..734f78a 100644 --- a/src/main/resources/mapper/MarketMapper.xml +++ b/src/main/resources/mapper/MarketMapper.xml @@ -29,8 +29,8 @@ - + select * from markets where name=#{country}