From e38b8def6e95c365bb436585b16ccc6167dd341b Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 21 Oct 2025 10:36:14 +0800 Subject: [PATCH 1/2] =?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 2/2] =?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} +