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 select(@Param("paymentId") String paymentId, + @Param("relationId") Long relationId, + @Param("relationIdType") String relationIdType); + + List 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 @@ + + + + + + SELECT payment_id AS paymentId, relation_id AS relationId, relation_type AS relationIdType + FROM payment_relation + + + + INSERT INTO payment_relation(payment_id, relation_id, relation_type) + VALUES (#{paymentId}, #{relationId}, #{relationIdType}) + + + + + + + \ 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 @@ party_order_id, query_url, pay_time, - create_time, - update_time, + create_time,update_time #{paymentId}, @@ -110,8 +109,7 @@ #{partyOrderId}, #{queryUrl}, #{payTime}, - #{createTime}, - #{updateTime}, + NOW(),NOW() @@ -137,8 +135,7 @@ party_order_id = #{partyOrderId}, query_url = #{queryUrl}, pay_time = #{payTime}, - create_time = #{createTime}, - update_time = #{updateTime}, + update_time = NOW() where payment_id = #{paymentId}