From 7eb9abbdb5f9780c214ce092cc6112ac4614f747 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 10 Feb 2025 16:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E6=94=B6Stripe?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=97=B6=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E9=97=AE=E9=A2=98=EF=BC=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/common/utils/RequestInfoUtil.java     |  2 +-
 .../com/ai/da/mapper/primary/PaymentInfoMapper.java |  3 +++
 .../da/mapper/primary/SubscriptionInfoMapper.java   |  3 ++-
 .../ai/da/service/impl/PaymentInfoServiceImpl.java  |  6 ++++--
 .../com/ai/da/service/impl/StripeServiceImpl.java   |  4 +++-
 .../resources/mapper/primary/PaymentInfoMapper.xml  | 11 +++++++++++
 .../mapper/primary/SubscriptionInfoMapper.xml       | 13 +++++++++++++
 7 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/mapper/primary/SubscriptionInfoMapper.xml

diff --git a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java
index d041362f..ace3af37 100644
--- a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java
+++ b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java
@@ -93,7 +93,7 @@ public class RequestInfoUtil {
             BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
             String output;
             StringBuilder outputBuilder = new StringBuilder();
-            System.out.println("Output from Server .... \n");
+//            System.out.println("Output from Server .... \n");
             while ((output = br.readLine()) != null) {
                 outputBuilder.append(output);
                 System.out.println(output);
diff --git a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
index c6721dd1..8841e85c 100644
--- a/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
@@ -4,6 +4,7 @@ import com.ai.da.mapper.primary.entity.PaymentInfo;
 import com.ai.da.model.vo.OrderListVO;
 import com.ai.da.model.vo.PaymentInfoVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -26,4 +27,6 @@ public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
     List<Map<String, String>> getCities();
 
     List<Map<String, String>> getCountries();
+
+    int insertIgnore(@Param("paymentInfo")PaymentInfo paymentInfo);
 }
diff --git a/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java b/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java
index 8a45bb7e..79a6c14f 100644
--- a/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/SubscriptionInfoMapper.java
@@ -2,7 +2,8 @@ package com.ai.da.mapper.primary;
 
 import com.ai.da.mapper.primary.entity.SubscriptionInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 public interface SubscriptionInfoMapper extends BaseMapper<SubscriptionInfo> {
-
+    int insertIgnore(@Param("subscriptionInfo") SubscriptionInfo subscriptionInfo);
 }
diff --git a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
index f5db3e24..fa22e6e9 100644
--- a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
@@ -285,7 +285,8 @@ public class PaymentInfoServiceImpl extends ServiceImpl<PaymentInfoMapper, Payme
                 paymentInfo.setCity(orderByOrderNo.getCity());
                 paymentInfo.setIpAddress(orderByOrderNo.getIpAddress());
             }
-            baseMapper.insert(paymentInfo);
+            int row = baseMapper.insertIgnore(paymentInfo);
+            log.info("Payment Info insert affect rows:{}", row);
         }else {
             paymentInfo.setTradeState(status);
             paymentInfo.setUpdateTime(LocalDateTime.now());
@@ -354,7 +355,8 @@ public class PaymentInfoServiceImpl extends ServiceImpl<PaymentInfoMapper, Payme
                 paymentInfo.setCity(orderByOrderNo.getCity());
                 paymentInfo.setIpAddress(orderByOrderNo.getIpAddress());
             }
-            baseMapper.insert(paymentInfo);
+            int row = baseMapper.insertIgnore(paymentInfo);
+            log.info("Payment Info insert affect rows:{}", row);
         }else {
             paymentInfo.setTradeState(charge.getStatus());
             paymentInfo.setPaymentMethod(paymentMethod);
diff --git a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
index 80d4dd63..1db6d686 100644
--- a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
@@ -482,7 +482,9 @@ public class StripeServiceImpl implements StripeService {
             subscriptionInfo.setCurrentPeriodStart(subscription.getCurrentPeriodStart());
             subscriptionInfo.setCurrentPeriodEnd(subscription.getCurrentPeriodEnd());
             subscriptionInfo.setCreateTime(LocalDateTime.now());
-            subscriptionInfoMapper.insert(subscriptionInfo);
+
+            int rows = subscriptionInfoMapper.insertIgnore(subscriptionInfo);
+            log.info("Subscription info insert affect rows : {}", rows);
 
             if (subscriptionInfo.getStatus().equals("active")){
                 log.info("创建订阅更新账号信息");
diff --git a/src/main/resources/mapper/primary/PaymentInfoMapper.xml b/src/main/resources/mapper/primary/PaymentInfoMapper.xml
index 29a82d72..4abc6c8d 100644
--- a/src/main/resources/mapper/primary/PaymentInfoMapper.xml
+++ b/src/main/resources/mapper/primary/PaymentInfoMapper.xml
@@ -163,4 +163,15 @@
           AND TRIM(country) != ''
     </select>
 
+    <insert id="insertIgnore" parameterType="com.ai.da.mapper.primary.entity.PaymentInfo">
+        INSERT IGNORE INTO
+               t_payment_info (order_no, transaction_id, payment_type, trade_state, payer_total,
+                                    type, content, notified, payment_method, last4, hosted_invoice_url,
+                                country, city, ip_address, create_time)
+               VALUES (#{paymentInfo.orderNo}, #{paymentInfo.transactionId}, #{paymentInfo.paymentType},
+        #{paymentInfo.tradeState}, #{paymentInfo.payerTotal}, #{paymentInfo.content},#{paymentInfo.type},
+        #{paymentInfo.notified},#{paymentInfo.paymentMethod}, #{paymentInfo.last4},#{paymentInfo.hostedInvoiceUrl},
+        #{paymentInfo.ipAddress},#{paymentInfo.country},#{paymentInfo.city},#{paymentInfo.createTime});
+    </insert>
+
 </mapper>
diff --git a/src/main/resources/mapper/primary/SubscriptionInfoMapper.xml b/src/main/resources/mapper/primary/SubscriptionInfoMapper.xml
new file mode 100644
index 00000000..bfbb6979
--- /dev/null
+++ b/src/main/resources/mapper/primary/SubscriptionInfoMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ai.da.mapper.primary.SubscriptionInfoMapper">
+    <insert id="insertIgnore" parameterType="com.ai.da.mapper.primary.entity.SubscriptionInfo">
+        INSERT IGNORE INTO
+               t_subscription_info (account_id, order_no, subscription_id, type, status, cancel_notified,
+                                    next_pay_date, current_period_start, current_period_end, create_time)
+               VALUES (#{subscriptionInfo.accountId}, #{subscriptionInfo.orderNo}, #{subscriptionInfo.subscriptionId},
+                        #{subscriptionInfo.type}, #{subscriptionInfo.status}, #{subscriptionInfo.cancelNotified},
+                        #{subscriptionInfo.nextPayDate}, #{subscriptionInfo.currentPeriodStart},
+                        #{subscriptionInfo.currentPeriodEnd}, #{subscriptionInfo.createTime});
+    </insert>
+</mapper>