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 90e3377..2e4a895 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -55,6 +55,8 @@ public class CashRecord implements Serializable { private LocalDateTime payTime; // 付款日期(到秒) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime receivedTime; // 到账日期(到秒) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private LocalDateTime auditTime; // 状态 & 操作人 private Integer status; // 订单状态 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 a059fdc..98e177e 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -402,6 +402,9 @@ public User getNameAndMarket(Integer jwcode) { log.error("失败订单ID: {}", failedIds); // 可存入 error_log 表,供人工处理 + + + // 这里选择继续下一批(容忍部分失败) } @@ -452,17 +455,17 @@ public User getNameAndMarket(Integer jwcode) { cashRecord.setPayload("IOS"); break; case 5: - cashRecord.setPayType("Stripe-链接收款"); + cashRecord.setPayType("Stripe"); cashRecord.setReceivedMarket("13"); cashRecord.setPayload("Stripe"); break; case 6: - cashRecord.setPayType("PaymentAsia-链接收款"); + cashRecord.setPayType("PaymentAsia"); cashRecord.setReceivedMarket("13"); cashRecord.setPayload("PaymentAsia"); break; case 7: - cashRecord.setPayType("Ipay88-链接收款"); + cashRecord.setPayType("Ipay88"); cashRecord.setReceivedMarket("5"); cashRecord.setPayload("Ipay88"); break; @@ -479,7 +482,9 @@ public User getNameAndMarket(Integer jwcode) { cashRecord.setFreeGold(0); cashRecord.setPaymentCurrency(""); cashRecord.setPaymentAmount(BigDecimal.valueOf(0)); - cashRecord.setPayTime(LocalDateTime.ofEpochSecond(gOrder.getSuccessTime(), 0, ZoneOffset.UTC)); + //转换时间戳,加上时区偏移 + cashRecord.setPayTime(LocalDateTime.ofEpochSecond(gOrder.getSuccessTime(), 0, ZoneOffset.of("+08:00"))); + cashRecord.setAuditTime(LocalDateTime.ofEpochSecond(gOrder.getSuccessTime(), 0, ZoneOffset.of("+08:00"))); cashRecord.setStatus(3); cashRecord.setSubmitterId(99999); //存入现金库 diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index f534bc9..8fe3aeb 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -231,7 +231,7 @@ add_time,is_synced from g_order where is_synced=0 and state=1 and pay_style in(3,5,6,7,9) - and success_time>1665246960 + and success_time>=1763136000 limit #{size}