yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1修改财务接口

Browse Source
This commit is contained in:
fengjundan 2021-08-13 10:24:10 +08:00
parent e4bcdfbc0c
commit a294568e6f
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java
View File

@ -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);
/**
* 更新清分状态 历史订单信息

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java
View File

@ -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) {

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java
View File

@ -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) {

2
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml
View File

@ -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,

2
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml
View File

@ -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,