From 2656a69b3ee8824a0b3af18990b71cc38fe676af Mon Sep 17 00:00:00 2001 From: fengjundan <1436525664@qq.com> Date: Fri, 6 Aug 2021 18:46:55 +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 --- .../mapper/XhpcChargingStationMapper.xml | 2 +- xhpc-modules/xhpc-order/pom.xml | 1 + ...ryOrderReconciliationStatusController.java | 12 +++++++++ ...pcHistoryOrderSortingStatusController.java | 12 +++++++++ .../order/mapper/XhpcHistoryOrderMapper.java | 10 +++++--- ...istoryOrderReconciliationStatusMapper.java | 9 +++++++ .../XhpcHistoryOrderSortingStatusMapper.java | 8 ++++++ ...storyOrderReconciliationStatusService.java | 13 ++++++++-- ...IXhpcHistoryOrderSortingStatusService.java | 8 ++++++ ...yOrderReconciliationStatusServiceImpl.java | 14 ++++++++++- ...cHistoryOrderSortingStatusServiceImpl.java | 13 +++++++++- .../mapper/XhpcHistoryOrderMapper.xml | 12 ++++----- ...HistoryOrderReconciliationStatusMapper.xml | 20 +++++++++++++-- .../XhpcHistoryOrderSortingStatusMapper.xml | 25 ++++++++++++++++--- .../resources/mapper/XhpcOperatorMapper.xml | 2 +- 15 files changed, 140 insertions(+), 21 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index 33ff085f..37c4b9a8 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -290,7 +290,7 @@ select charging_station_id as chargingStationId, (select type from xhpc_charging_pile - where charging_station_id = charging_station_id and del_flag = 0 and status = 0) as type, + where charging_station_id = charging_station_id and del_flag = 0 and status = 0 limit 1) as type, name as name, reminder_instructions as reminderInstructions, detailed_address as detailedAddress, diff --git a/xhpc-modules/xhpc-order/pom.xml b/xhpc-modules/xhpc-order/pom.xml index 5e5ae53c..650d1fa3 100644 --- a/xhpc-modules/xhpc-order/pom.xml +++ b/xhpc-modules/xhpc-order/pom.xml @@ -93,6 +93,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.4.0 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java index 41f55633..6a477e0c 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java @@ -70,4 +70,16 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll List> list = iXhpcHistoryOrderReconciliationStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); return getDataTable(list); } + + /** + * 清分详情 + * + * @param historyOrderId 历史订单id + * @return + */ + @GetMapping("/info") + @ApiOperation(value = "清分详情") + public AjaxResult info(@RequestParam Long historyOrderId) { + return iXhpcHistoryOrderReconciliationStatusService.info(historyOrderId); + } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java index 863b83a4..5c5907a7 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java @@ -72,4 +72,16 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController { List> list = iXhpcHistoryOrderSortingStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); return getDataTable(list); } + + /** + * 对账详情 + * + * @param historyOrderId 历史订单id + * @return + */ + @GetMapping("/info") + @ApiOperation(value = "对账详情") + public AjaxResult info(@RequestParam Long historyOrderId) { + return iXhpcHistoryOrderSortingStatusService.info(historyOrderId); + } } 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 20d7974f..1bf0b4ce 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); + public int updateReconciliation(String[] xhpcHistoryOrderIds, @Param("status") String status); /** * 更新清分状态 历史订单信息 @@ -51,20 +51,22 @@ public interface XhpcHistoryOrderMapper { * @param xhpcHistoryOrderIds 历史订单信息 * @return 结果 */ - public int updateSorting(String[] xhpcHistoryOrderIds); + public int updateSorting(@Param("xhpcHistoryOrderIds") String[] xhpcHistoryOrderIds, @Param("status") String status); /** * 用户历史订单表 + * * @param userId * @return */ - List> list(@Param("userId") Long userId); + List> list(@Param("userId") Long userId); /** * 订单详情 + * * @param userId * @param historyOrderId * @return */ - Map gethistotyOrderMessage(@Param("userId")Long userId,@Param("historyOrderId")Long historyOrderId); + Map gethistotyOrderMessage(@Param("userId") Long userId, @Param("historyOrderId") Long historyOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java index 4ef911c6..8d51847d 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java @@ -45,4 +45,13 @@ public interface XhpcHistoryOrderReconciliationStatusMapper { */ public List> page(@Param("userId") Long userId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation); + + /** + * 清分详情 + * + * @param historyOrderId 历史订单id + * @return + */ + public Map info(@Param("historyOrderId") Long historyOrderId); + } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java index 18d74f99..7b96d059 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java @@ -54,4 +54,12 @@ public interface XhpcHistoryOrderSortingStatusMapper { * @return 结果 */ public List> page(@Param("userId") Long userId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation); + + /** + * 对账详情 + * + * @param historyOrderId 历史订单id + * @return + */ + public Map info(@Param("historyOrderId") Long historyOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java index 01df70d1..430c78af 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java @@ -22,9 +22,10 @@ public interface IXhpcHistoryOrderReconciliationStatusService { /** * 修改对账状态 历史订单对账状态 + * * @param historyOrderIds 历史订单id集合 - * @param status 状态 - * @param remark 备注 + * @param status 状态 + * @param remark 备注 * @return */ public AjaxResult status(String historyOrderIds, Integer status, String remark); @@ -49,4 +50,12 @@ public interface IXhpcHistoryOrderReconciliationStatusService { * @return */ public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status); + + /** + * 清分详情 + * + * @param historyOrderId 历史订单id + * @return + */ + public AjaxResult info(Long historyOrderId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java index 79d086c8..fd7b5e0c 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java @@ -50,4 +50,12 @@ public interface IXhpcHistoryOrderSortingStatusService { * @return 结果 */ public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status); + + /** + * 对账详情 + * + * @param historyOrderId 历史订单id + * @return + */ + public AjaxResult info(Long historyOrderId); } 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 8021da79..9add29a2 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 @@ -81,7 +81,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis xhpcHistoryOrderReconciliationStatus.setRemark(remark); xhpcHistoryOrderReconciliationStatusMapper.insert(xhpcHistoryOrderReconciliationStatus); } - xhpcHistoryOrderMapper.updateReconciliation(historyOrderIds.split(",")); + xhpcHistoryOrderMapper.updateReconciliation(historyOrderIds.split(","), StringUtils.valueOf(status)); return AjaxResult.success(); } @@ -136,4 +136,16 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis } return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); } + + /** + * 清分详情 + * + * @param historyOrderId 历史订单id + * @return + */ + @Override + public AjaxResult info(Long historyOrderId) { + return AjaxResult.success(xhpcHistoryOrderReconciliationStatusMapper.info(historyOrderId)); + } + } 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 f3b06e2a..98857019 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 @@ -81,7 +81,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd xhpcHistoryOrderSortingStatus.setRemark(remark); xhpcHistoryOrderSortingStatusMapper.insert(xhpcHistoryOrderSortingStatus); } - xhpcHistoryOrderMapper.updateSorting(historyOrderIds.split(",")); + xhpcHistoryOrderMapper.updateSorting(historyOrderIds.split(","), StringUtils.valueOf(status)); return AjaxResult.success(); } @@ -137,4 +137,15 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd } return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); } + + /** + * 对账详情 + * + * @param historyOrderId 历史订单id + * @return + */ + @Override + public AjaxResult info(Long historyOrderId) { + return AjaxResult.success(xhpcHistoryOrderSortingStatusMapper.info(historyOrderId)); + } } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index eae023c6..9424b49a 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -281,17 +281,17 @@ where xho.del_flag = 0 and xho.history_order_id = #{historyOrderId} - + update xhpc_history_order set reconciliation_status = #{status} where history_order_id in - - #{xhpcHistoryOrderId} + + #{item} - + update xhpc_history_order set sorting_status = #{status} where history_order_id in - - #{xhpcHistoryOrderId} + + #{item} 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 8ece7106..f62852de 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml @@ -118,8 +118,8 @@ + + \ No newline at end of file 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 3341ab64..23982c1d 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_recharge_order + INSERT INTO xhpc_history_order_reconciliation_status history_order_id, @@ -144,8 +144,8 @@ + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml index f87dae73..55d092c6 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml @@ -286,7 +286,7 @@ CASE WHEN xo.`status` = 0 THEN '正常' else '禁用' end statusName,su.user_id userId, xdb.dict_value attributenName from xhpc_operator `xo` - LEFT JOIN sys_user su on su.internet_user_id = `xo`.operator_id + LEFT JOIN sys_user su on su.operator_id = `xo`.operator_id LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute where xo.del_flag = 0