From e38b8def6e95c365bb436585b16ccc6167dd341b Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 21 Oct 2025 10:36:14 +0800 Subject: [PATCH] =?UTF-8?q?10-21=20=E6=9C=AA=E7=9F=A5=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=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