From a294568e6fb6d02bbc8c48d43a335c46e4504660 Mon Sep 17 00:00:00 2001
From: fengjundan <1436525664@qq.com>
Date: Fri, 13 Aug 2021 10:24:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java | 2 +-
 .../impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java   | 2 +-
 .../service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java  | 2 +-
 .../mapper/XhpcHistoryOrderReconciliationStatusMapper.xml       | 2 +-
 .../resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java
index 525d48a6..d1cd65ac 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java
@@ -43,7 +43,7 @@ public interface XhpcHistoryOrderMapper {
      * @param xhpcHistoryOrderIds 历史订单信息
      * @return 结果
      */
-    public int updateReconciliation(String[] xhpcHistoryOrderIds, @Param("status") String status);
+    public int updateReconciliation(@Param("xhpcHistoryOrderIds") String[] xhpcHistoryOrderIds, @Param("status") String status);
 
     /**
      * 更新清分状态 历史订单信息
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java
index 9add29a2..f298f344 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java
@@ -67,7 +67,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis
                     return AjaxResult.error(HttpStatus.ERROR_STATUS, "状态异常");
                 }
             } else if (StatusConstants.RECONCILIATION_STATUS_SUBMITTRD == status) {
-                if (StatusConstants.RECONCILIATION_STATUS_WAIT != xhpcHistoryOrder.getReconciliationStatus()) {
+                if (StatusConstants.RECONCILIATION_STATUS_WAIT != xhpcHistoryOrder.getReconciliationStatus() && StatusConstants.RECONCILIATION_STATUS_EXAMINE != xhpcHistoryOrder.getReconciliationStatus()) {
                     return AjaxResult.error(HttpStatus.ERROR_STATUS, "状态异常");
                 }
             } else if (StatusConstants.RECONCILIATION_STATUS_EXAMINE == status) {
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java
index 98857019..4a38c6aa 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java
@@ -67,7 +67,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd
                     return AjaxResult.error(HttpStatus.ERROR_STATUS, "状态异常");
                 }
             } else if (StatusConstants.SORTING_STATUS_SUBMITTRD == status) {
-                if (StatusConstants.SORTING_STATUS_CONFIRMED != xhpcHistoryOrder.getSortingStatus()) {
+                if (StatusConstants.SORTING_STATUS_CONFIRMED != xhpcHistoryOrder.getSortingStatus() && StatusConstants.SORTING_STATUS_EXAMINE != xhpcHistoryOrder.getSortingStatus()) {
                     return AjaxResult.error(HttpStatus.ERROR_STATUS, "状态异常");
                 }
             } else if (StatusConstants.SORTING_STATUS_EXAMINE == status) {
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
index f62852de..ae474b5c 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
@@ -19,7 +19,7 @@
 
     <insert id="insert" parameterType="com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus"
             useGeneratedKeys="true" keyProperty="historyOrderReconciliationStatusId">
-        INSERT INTO xhpc_recharge_order
+        INSERT INTO xhpc_history_order_reconciliation_status
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="null != historyOrderId and '' != historyOrderId">
                 history_order_id,
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
index 23982c1d..ccbe9cc4 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
@@ -18,7 +18,7 @@
 
     <insert id="insert" parameterType="com.xhpc.order.domain.XhpcHistoryOrderSortingStatus" useGeneratedKeys="true"
             keyProperty="historyOrderSortingStatusId">
-        INSERT INTO xhpc_history_order_reconciliation_status
+        INSERT INTO xhpc_history_order_sorting_status
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="null != historyOrderId and '' != historyOrderId">
                 history_order_id,