diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
index 82af8b6ed..17adf8724 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
@@ -309,6 +309,14 @@ public class PayController extends BaseController {
return response;
}
+ /**
+ * 汇付支付退款
+ */
+ public RestApiResponse> adapayRefund(HttpServletRequest request, @RequestBody WeChatRefundDTO dto) {
+
+ return null;
+ }
+
/**
* 汇付支付回调
* ...
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
index 4c3a70bcc..d4cffbd70 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
@@ -22,7 +22,9 @@ public class AdapayCallbackRecord implements Serializable {
/**
* 主键id
*/
- private String id;
+ private Integer id;
+
+ private String paymentId;
/**
* 汇付商户appId
@@ -82,23 +84,4 @@ public class AdapayCallbackRecord implements Serializable {
private static final long serialVersionUID = 1L;
- public AdapayCallbackRecord(String id, String appId, String description, String createdTime, String endTime, BigDecimal feeAmt, String orderNo, String outTransId, String partyOrderId, BigDecimal payAmt, String payChannel, BigDecimal realAmt, String shareEq, String status, String wxUserId, Date createTime, String delFlag) {
- this.id = id;
- this.appId = appId;
- this.description = description;
- this.createdTime = createdTime;
- this.endTime = endTime;
- this.feeAmt = feeAmt;
- this.orderNo = orderNo;
- this.outTransId = outTransId;
- this.partyOrderId = partyOrderId;
- this.payAmt = payAmt;
- this.payChannel = payChannel;
- this.realAmt = realAmt;
- this.shareEq = shareEq;
- this.status = status;
- this.wxUserId = wxUserId;
- this.createTime = createTime;
- this.delFlag = delFlag;
- }
}
\ No newline at end of file
diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
index 043393343..8b73bedcb 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
@@ -2,7 +2,8 @@
-
+
+
@@ -22,7 +23,7 @@
- id, app_id, description, created_time, end_time, expend, fee_amt, order_no, out_trans_id,
+ id, payment_id, app_id, description, created_time, end_time, expend, fee_amt, order_no, out_trans_id,
party_order_id, pay_amt, pay_channel, real_amt, share_eq, `status`, wx_user_id, create_time,
del_flag
@@ -37,12 +38,12 @@
where id = #{id,jdbcType=VARCHAR}
- insert into adapay_callback_record (id, app_id, description, created_time,
+ insert into adapay_callback_record (payment_id, app_id, description, created_time,
end_time, expend, fee_amt,
order_no, out_trans_id, party_order_id,
pay_amt, pay_channel, real_amt,
share_eq, `status`, wx_user_id)
- values (#{id},#{appId,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createdTime,jdbcType=VARCHAR},
+ values (#{paymentId,jdbcType=VARCHAR},#{appId,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createdTime,jdbcType=VARCHAR},
#{endTime,jdbcType=VARCHAR}, #{expend,jdbcType=OTHER}, #{feeAmt,jdbcType=DECIMAL},
#{orderNo,jdbcType=VARCHAR}, #{outTransId,jdbcType=VARCHAR}, #{partyOrderId,jdbcType=VARCHAR},
#{payAmt,jdbcType=DECIMAL}, #{payChannel,jdbcType=VARCHAR}, #{realAmt,jdbcType=DECIMAL},
@@ -51,6 +52,9 @@
insert into adapay_callback_record
+
+ payment_id,
+
app_id,
@@ -104,6 +108,9 @@
+
+ #{paymentId,jdbcType=VARCHAR},
+
#{appId,jdbcType=VARCHAR},
@@ -160,6 +167,9 @@
update adapay_callback_record
+
+ payment_id = #{paymentId,jdbcType=VARCHAR},
+
app_id = #{appId,jdbcType=VARCHAR},
@@ -216,7 +226,8 @@
update adapay_callback_record
- set app_id = #{appId,jdbcType=VARCHAR},
+ set payment_id = #{paymentId,jdbcType=VARCHAR},
+ app_id = #{appId,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR},
created_time = #{createdTime,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=VARCHAR},