diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 7854687..34f80b8 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -119,4 +119,14 @@ public class CashCollectionController { return Result.error(e.getMessage()); } } + //同步g_order订单到cash_record表 + @PostMapping("/syncToCashRecord") + public Result syncToCashRecord() { + try { + return Result.success(cashCollectionService.syncToCashRecord()); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + + } } diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index c7fc487..1401499 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -32,4 +32,6 @@ public interface CashCollectionService { User getNameAndMarket(Integer jwcode); //获取活动列表 List getActivityList(); + //同步g_order订单到cash_record表 + Object syncToCashRecord(); } 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 22ffa87..e1cdb37 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -1,6 +1,7 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.coin.Result; @@ -11,6 +12,8 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; 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.util.List; import java.util.UUID; @@ -227,4 +230,50 @@ public class CashCollectionServiceImpl implements CashCollectionService { public List getActivityList() { return cashCollectionMapper.getActivityList(); } -} + //同步g_order订单到cash_record表 + @Override + @Transactional(rollbackFor = Exception.class) + public Object syncToCashRecord() { + while (true) { + List gOrders = cashCollectionMapper.getUnSync(100); + if (CollectionUtils.isEmpty(gOrders)) { + break; + } + for (GOrder gOrder : gOrders) { + CashRecord cashRecord = new CashRecord(); + cashRecord.setOrderType(1); + cashRecord.setJwcode(gOrder.getJwcode()); + cashRecord.setName(cashCollectionMapper.getNameByJwcode(gOrder.getJwcode())); + cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(gOrder.getJwcode())); + 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()); + break; + case 5: + cashRecord.setPayType("Stripe-链接收款"); + break; + case 6: + cashRecord.setPayType("PaymentAsia-链接收款"); + break; + case 7: + cashRecord.setPayType("Ipay88-链接收款"); + break; + case 9: + cashRecord.setPayType("FistData"); + break; + default: + break; + } + } + cashRecord.setGoodsName("Link充值金币"); + } + }return "同步成功"; + }} diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 4622bef..1b57cb7 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -87,7 +87,6 @@ AND received_time IS NOT NULL AND payment_currency IS NOT NULL AND payment_currency != '' AND payment_amount IS NOT NULL - AND bank_code IS NOT NULL AND bank_code != '' THEN 4 ELSE status END