From 202eb5237a09f95be8063307d1fd3115b00febb8 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 25 Mar 2023 22:00:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/OrderDetailController.java          |  4 ++++
 .../ghy/web/pojo/vo/OrderListResponse.java    | 23 +++++++++++++++++++
 .../mapper/order/OrderDetailMapper.xml        |  3 ++-
 .../financial/FinancialDetailMapper.xml       |  4 ++--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 25cca923..6c46732a 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -485,6 +485,10 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setUpdateTime(detail.getUpdateTime());
             orderListResponse.setShelveStatus(detail.getShelveStatus());
             orderListResponse.setLedgerAccountStatus(detail.getLedgerAccountStatus());
+//            orderListResponse.setDrawCashId(detail.getDrawCashId());
+            orderListResponse.setDrawCashTime(detail.getDrawCashTime());
+            orderListResponse.setDrawCashStatus(detail.getDrawCashStatus());
+            orderListResponse.setArrivalTime(detail.getArrivalTime());
             orderListResponses.add(orderListResponse);
         });
         return voDataTable(orderListResponses, list);
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index f5ac7ff8..c1f0d408 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -114,4 +114,27 @@ public class OrderListResponse {
     private List<FinancialChangeRecord> financialChangeRecords;
 
     private List<GoodsArea> goodsAreaList;
+
+    /**
+     * 发起提现后Adapay返回的对象ID draw_cash_id
+     */
+    private String drawCashId;
+
+    /**
+     * draw_cash_status
+     * 0 未分账
+     * 1 已分账
+     * 2 已到账
+     * -1 提现失败
+     */
+    private Integer drawCashStatus;
+
+    /**
+     * 发起提现时间 draw_cash_time
+     */
+    private Date drawCashTime;
+    /**
+     * 提现到账时间 arrival_time
+     */
+    private Date arrivalTime;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index b4759f9f..b253d43a 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -84,7 +84,8 @@
                od.create_by,
                od.create_time,
                od.update_time,
-               od.remark
+               od.remark,
+               od.draw_cash_status
         FROM order_detail od
         LEFT JOIN order_master om ON om.id = od.order_master_id
         LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml
index a31da801..0bc890bc 100644
--- a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml
+++ b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml
@@ -87,10 +87,10 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="billingState == '1'">
+            <if test="billingState == '1'.toString()">
                 and od.order_status in ('0','1','2','3','4')
             </if>
-            <if test="billingState != null and billingState != '' and billingState != '1'">
+            <if test="billingState != null and billingState != '' and billingState != '1'.toString()">
                 and od.order_status = #{billingState}
             </if>
         </where>