From 05265ac17e69f691872ef29744cc10da671e52df Mon Sep 17 00:00:00 2001
From: Hawking <hhawking@qq.com>
Date: Wed, 31 May 2023 15:32:07 +0800
Subject: [PATCH] =?UTF-8?q?PaymentRelationMapper=20=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/callback/PayCallbackService.java  |  2 +-
 .../payment/mapper/PaymentRelationMapper.java | 18 ++++++++++++
 .../mapper/payment/PaymentRelationMapper.xml  | 29 +++++++++++++++++++
 .../mapper/system/AdapyPaymentMapper.xml      |  9 ++----
 4 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 ghy-payment/src/main/java/com/ghy/payment/mapper/PaymentRelationMapper.java
 create mode 100644 ghy-payment/src/main/resources/mapper/payment/PaymentRelationMapper.xml

diff --git a/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java b/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java
index 61567ecf..08fac14b 100644
--- a/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java
+++ b/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java
@@ -133,7 +133,7 @@ public class PayCallbackService implements CallBackService {
         // 保存一条支付记录
         PaymentDTO payment = response.toJavaObject(PaymentDTO.class);
         String status = payment.getStatus();
-
+        payment.setStatus(AdapayStatusEnum.pending.code);
         financialMasterService.insertPayment(payment);
 
         if (!AdapayStatusEnum.succeeded.code.equals(status)) {
diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/PaymentRelationMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/PaymentRelationMapper.java
new file mode 100644
index 00000000..e8a43c06
--- /dev/null
+++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/PaymentRelationMapper.java
@@ -0,0 +1,18 @@
+package com.ghy.payment.mapper;
+
+import com.ghy.payment.domain.PaymentRelation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PaymentRelationMapper {
+
+    int insert(PaymentRelation record);
+
+    List<PaymentRelation> select(@Param("paymentId") String paymentId,
+                                 @Param("relationId") Long relationId,
+                                 @Param("relationIdType") String relationIdType);
+
+    List<PaymentRelation> selectByPaymentId(String paymentId);
+
+}
diff --git a/ghy-payment/src/main/resources/mapper/payment/PaymentRelationMapper.xml b/ghy-payment/src/main/resources/mapper/payment/PaymentRelationMapper.xml
new file mode 100644
index 00000000..6260e8b1
--- /dev/null
+++ b/ghy-payment/src/main/resources/mapper/payment/PaymentRelationMapper.xml
@@ -0,0 +1,29 @@
+<?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.ghy.payment.mapper.PaymentRelationMapper">
+
+    <sql id="select_columns">
+        SELECT payment_id AS paymentId, relation_id AS relationId, relation_type AS relationIdType
+        FROM payment_relation
+    </sql>
+
+    <insert id="insert" parameterType="com.ghy.payment.domain.DrawCashRecord">
+        INSERT INTO payment_relation(payment_id, relation_id, relation_type)
+        VALUES (#{paymentId}, #{relationId}, #{relationIdType})
+    </insert>
+
+    <select id="selectByPaymentId" resultType="com.ghy.payment.domain.PaymentRelation">
+        <include refid="select_columns"/>
+        WHERE payment_id = #{paymentId}
+    </select>
+
+    <select id="select" resultType="com.ghy.payment.domain.PaymentRelation">
+        <include refid="select_columns"/>
+        <where>
+            <if test="paymentId != null and paymentId != ''">AND payment_id = #{paymentId}</if>
+            <if test="relationId != null">AND relation_id = #{relationId}</if>
+            <if test="relationIdType != null and relationIdType != ''">AND relation_type = #{relationIdType}</if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ghy-system/src/main/resources/mapper/system/AdapyPaymentMapper.xml b/ghy-system/src/main/resources/mapper/system/AdapyPaymentMapper.xml
index b8e691ea..8f48cda5 100644
--- a/ghy-system/src/main/resources/mapper/system/AdapyPaymentMapper.xml
+++ b/ghy-system/src/main/resources/mapper/system/AdapyPaymentMapper.xml
@@ -86,8 +86,7 @@
             <if test="partyOrderId != null">party_order_id,</if>
             <if test="queryUrl != null">query_url,</if>
             <if test="payTime != null">pay_time,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
+            create_time,update_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paymentId != null">#{paymentId},</if>
@@ -110,8 +109,7 @@
             <if test="partyOrderId != null">#{partyOrderId},</if>
             <if test="queryUrl != null">#{queryUrl},</if>
             <if test="payTime != null">#{payTime},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            NOW(),NOW()
         </trim>
     </insert>
 
@@ -137,8 +135,7 @@
             <if test="partyOrderId != null">party_order_id = #{partyOrderId},</if>
             <if test="queryUrl != null">query_url = #{queryUrl},</if>
             <if test="payTime != null">pay_time = #{payTime},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            update_time = NOW()
         </trim>
         where payment_id = #{paymentId}
     </update>