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 INTO xhpc_recharge_order + INSERT INTO xhpc_history_order_reconciliation_status 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 INTO xhpc_history_order_reconciliation_status + INSERT INTO xhpc_history_order_sorting_status history_order_id,