From e38b8def6e95c365bb436585b16ccc6167dd341b Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 21 Oct 2025 10:36:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?10-21=20=E6=9C=AA=E7=9F=A5=E5=9C=B0?= =?UTF-8?q?=E5=8C=BA=E6=94=B9=E4=B8=BA=E9=9D=9E=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/serviceImpl/cash/CashCollectionServiceImpl.java | 15 ++++++++++----- .../demo/serviceImpl/coin/WorkbenchServiceImpl.java | 2 +- src/main/resources/cashMapper/CashCollectionMapper.xml | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index e1cdb37..86741cb 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.List; import java.util.UUID; @@ -245,35 +246,39 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashRecord.setJwcode(gOrder.getJwcode()); cashRecord.setName(cashCollectionMapper.getNameByJwcode(gOrder.getJwcode())); cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(gOrder.getJwcode())); - cashRecord.setActivity("Link充值金币"); + cashRecord.setActivity("Link日常充值"); cashRecord.setOrderCode(gOrder.getOrderNo()); if (gOrder != null) { switch (gOrder.getPayStyle()) { case 3: cashRecord.setPayType("IOS内购"); cashRecord.setBankCode(gOrder.getIosTransactionId()); - break; - case 4: - cashRecord.setPayType("Paypal"); - cashRecord.setBankCode(gOrder.getPaypalOrderId()); + cashRecord.setReceivedMarket("3"); break; case 5: cashRecord.setPayType("Stripe-链接收款"); + cashRecord.setReceivedMarket("13"); break; case 6: cashRecord.setPayType("PaymentAsia-链接收款"); + cashRecord.setReceivedMarket("13"); break; case 7: cashRecord.setPayType("Ipay88-链接收款"); + cashRecord.setReceivedMarket("5"); break; case 9: cashRecord.setPayType("FistData"); + cashRecord.setReceivedMarket("4"); break; default: break; } } cashRecord.setGoodsName("Link充值金币"); + cashRecord.setPermanentGold(gOrder.getCount()); + cashRecord.setPayTime(java.time.LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(gOrder.getSuccessTime()), java.time.ZoneId.systemDefault())); + // cashCollectionMapper. } }return "同步成功"; }} diff --git a/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java index dde9d1c..e702506 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java @@ -63,7 +63,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { allMarkets.remove("总部"); // 固定顺序 List fixed = Arrays.asList( - "新加坡", "马来西亚", "香港", "加拿大", "泰国", "越南HCM", "韩国", "未知" + "新加坡", "马来西亚", "香港", "加拿大", "泰国", "越南HCM", "韩国", "非网" ); // 先放固定顺序（存在的才放） diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 1b57cb7..ff1e653 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -200,7 +200,7 @@ success_time,ios_environment,ios_transaction_id,ios_receipt_data, paypal_order_id,add_time,is_synced from g_order - where is_synced=0 and state=1 and type='gold_coin' + where is_synced=0 and state=1 and type='gold_coin' and pay_style in(3,5,6,7,9) limit #{size} \ No newline at end of file From 239c71f55f60cc61fad211cd0f401f90eb3b5424 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 21 Oct 2025 11:37:59 +0800 Subject: [PATCH 02/12] =?UTF-8?q?10-21=20=E5=90=8C=E6=AD=A5=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E6=94=B6=E6=AC=BE=E6=95=B0=E6=8D=AE=EF=BC=88=E4=BB=8E?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E8=A1=A8=E4=B8=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/mapper/cash/CashCollectionMapper.java | 5 +++-- .../cash/CashCollectionServiceImpl.java | 22 +++++++++++++++++++--- .../resources/cashMapper/CashCollectionMapper.xml | 10 ++++++++-- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 06697e6..7c598fb 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -48,6 +48,7 @@ public interface CashCollectionMapper { List getActivityList(); //查找未同步的订单 ListgetUnSync(@Param("size")int size); - //同步g_order订单到cash_record表 - // int syncToCashRecord(CashRecord record); + //给同步过去的gOrder设置同步状态 + int markSynced(@Param("orderId") Integer orderId); + } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 86741cb..cd583ab 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -10,12 +10,15 @@ import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.service.cash.CashCollectionService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.util.List; import java.util.UUID; @@ -28,6 +31,7 @@ import java.util.UUID; * @Version 1.0 **/ @Service +@Slf4j public class CashCollectionServiceImpl implements CashCollectionService { @Autowired @@ -276,9 +280,21 @@ public class CashCollectionServiceImpl implements CashCollectionService { } } cashRecord.setGoodsName("Link充值金币"); + cashRecord.setGoodNum(0); cashRecord.setPermanentGold(gOrder.getCount()); - cashRecord.setPayTime(java.time.LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(gOrder.getSuccessTime()), java.time.ZoneId.systemDefault())); - // cashCollectionMapper. + cashRecord.setFreeGold(0); + cashRecord.setPaymentCurrency(""); + cashRecord.setPaymentAmount(BigDecimal.valueOf(0)); + cashRecord.setPayTime(LocalDateTime.ofEpochSecond(gOrder.getSuccessTime(), 0, ZoneOffset.UTC)); + cashRecord.setStatus(3); + cashRecord.setSubmitterId(99999); + cashRecord.setRemark("Link充值金币"); + //存入现金库 + cashCollectionMapper.add(cashRecord); + cashCollectionMapper.markSynced(gOrder.getId()); + }log.info("同步完成一批，数量 {}", gOrders.size()); + if (gOrders.size() < 100) { + break; // 最后一批 } - }return "同步成功"; + }return "同步完毕"; }} diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index ff1e653..e53cbff 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -94,6 +94,12 @@ WHERE order_code = #{cashRecord.orderCode} AND status IN (1, 3) + + + update g_order + set is_synced = 1 + where id = #{orderId} + @@ -164,7 +164,7 @@ from statistics where market = #{market} and current_datetime >= #{startDate} - and current_datetime < #{endDate} + and current_datetime <= #{endDate} group by month order by month From 072afb22969c30d6e0ded061ca29a3136b63a256 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 21 Oct 2025 16:41:49 +0800 Subject: [PATCH 04/12] =?UTF-8?q?10-21=20=E6=94=B6=E6=AC=BE=EF=BC=9A?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9=EF=BC=88?= =?UTF-8?q?=E5=9C=B0=E6=96=B9=E8=B4=A2=E5=8A=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/domain/entity/CashRecord.java | 1 + .../demo/domain/vo/cash/CashCollection.java | 1 + .../cash/CashCollectionServiceImpl.java | 23 +++++++++----- .../resources/cashMapper/CashCollectionMapper.xml | 37 +++++++++++++++++----- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/example/demo/domain/entity/CashRecord.java b/src/main/java/com/example/demo/domain/entity/CashRecord.java index 8e1c351..958f5bb 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -56,6 +56,7 @@ public class CashRecord implements Serializable { // 状态 & 操作人 private Integer status; // 订单状态 private Integer submitterId; // 提交人 id + private String submitterMarket; //提交人地区 private String voucher; // 转账凭证 private String remark; // 备注 private String rejectReason; // 驳回理由 diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 451bba9..bfdccd3 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -54,6 +54,7 @@ public class CashCollection implements Serializable { //状态 操作人 private Integer status; // 订单状态 private Integer submitterId; // 提交人 id + private String submitterMarket; //提交人地区 private String submitterName; // 提交人 姓名 private String voucher; // 转账凭证 private String remark; // 备注 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index cd583ab..209fde2 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -102,6 +102,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashRecord.setRemark(cashCollection.getRemark()); //备注 cashRecord.setStatus(0); //订单状态：付款线下财务待审核 cashRecord.setSubmitterId(cashCollection.getSubmitterId()); //提交人ID + cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket()); cashRecord.setOrderType(1); //订单类型：1-收款 cashRecord.setMarket(cashCollection.getMarket()); //地区，根据jwcode插入 @@ -185,25 +186,31 @@ public class CashCollectionServiceImpl implements CashCollectionService { if (markets.contains("9") || markets.contains("9999")){ markets=null; } - cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); + // cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket())); if (cashCollection.getCashRoleId()==2) { //角色是总部时，传1346，sql处理为（1，3，4，6）筛选， cashCollection.setStatus(1346); cashCollection.setSubmitterId(null); cashCollection.setReceivedMarket(null); - }if (cashCollection.getCashRoleId()==1){ + cashCollection.setSubmitterMarket(null); + } + if (cashCollection.getCashRoleId()==1){ //角色是地方财务，提交人置空不设筛选条件,仅按地区筛选，查看 - if(cashCollection.getStatus()==null){ - cashCollection.setStatus(123460); - } + if(cashCollection.getStatus()==null){ + cashCollection.setStatus(123460);} + if (cashCollection.getStatus()==0||cashCollection.getStatus()==2){ + cashCollection.setReceivedMarket(null);} + if (cashCollection.getStatus()==1||cashCollection.getStatus()==3){ + cashCollection.setSubmitterMarket(null);} cashCollection.setSubmitterId(null); - }if (cashCollection.getCashRoleId()==0){ + + } + if (cashCollection.getCashRoleId()==0){ //角色是地方财务，提交人置空不设筛选条件---仅当角色是0 地方客服时，按提交人筛选 if(cashCollection.getStatus()==null){ - cashCollection.setStatus(1234560); - } + cashCollection.setStatus(1234560);} cashCollection.setSubmitterId(cashCollection.getSubmitterId()); cashCollection.setReceivedMarket(null); } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index e53cbff..25d247b 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -9,12 +9,12 @@ cash_record(order_type,jwcode,name,market,activity, order_code,goods_name,good_num,permanent_gold,free_gold, payment_currency,payment_amount,received_market, - pay_type,pay_time,status,submitter_id, + pay_type,pay_time,status,submitter_id,submtter_market, voucher,remark) values(#{orderType},#{jwcode},#{name},#{market},#{activity}, #{orderCode},#{goodsName},#{goodNum},#{permanentGold},#{freeGold},#{paymentCurrency}, #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, - #{status},#{submitterId},#{voucher},#{remark}) + #{status},#{submitterId},#{submitterMarket},#{voucher},#{remark}) + + + AND cr.received_market = #{cashCollection.receivedMarket} + + + AND cr.submitter_market = #{cashCollection.submitterMarket} + + AND cr.activity like concat('%',#{cashCollection.activity},'%') From 4f5328bd85be48950507b07108bbebed200fe298 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 22 Oct 2025 10:03:13 +0800 Subject: [PATCH 05/12] =?UTF-8?q?10-22=20=E6=94=B6=E6=AC=BE=EF=BC=9A?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=9D=83=E9=99=90=E7=BB=A7=E7=BB=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=88=E5=9C=B0=E6=96=B9=E8=B4=A2=E5=8A=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/serviceImpl/cash/CashCollectionServiceImpl.java | 5 ++++- src/main/resources/cashMapper/CashCollectionMapper.xml | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 209fde2..f31fac4 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -196,15 +196,18 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollection.setSubmitterMarket(null); } if (cashCollection.getCashRoleId()==1){ - //角色是地方财务，提交人置空不设筛选条件,仅按地区筛选，查看 + //角色是地方财务，提交人置空不设筛选条件,仅按收款地区、提交人地区筛选（） if(cashCollection.getStatus()==null){ cashCollection.setStatus(123460);} + //状态为待审核和已驳回时按照提交人地区筛选 if (cashCollection.getStatus()==0||cashCollection.getStatus()==2){ cashCollection.setReceivedMarket(null);} + //状态为已通过和Link通过时，按收款地区筛选 if (cashCollection.getStatus()==1||cashCollection.getStatus()==3){ cashCollection.setSubmitterMarket(null);} cashCollection.setSubmitterId(null); + //状态为46，已通过和已退款，满足收款地区或提交人地区即可， } if (cashCollection.getCashRoleId()==0){ diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 25d247b..a9d8cce 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -147,8 +147,8 @@ AND cr.submitter_id = #{cashCollection.submitterId} - + + AND cr.received_market = #{cashCollection.receivedMarket} AND cr.submitter_market = #{cashCollection.submitterMarket} - + + AND cr.activity like concat('%',#{cashCollection.activity},'%') 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 06/12] =?UTF-8?q?10.20=20=E4=BF=AE=E6=94=B9=E5=9C=B0?= =?UTF-8?q?=E5=8C=BA=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}