From e470ce2301c8c3ef15a4fd3d2ef82393f68f4bc9 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Wed, 28 Sep 2022 13:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B8=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=96=B0=E5=A2=9E=20code=EF=BC=9A3886?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XhpcPileEditionController.java |  5 +++
 .../station/mapper/XhpcPileEditionMapper.java |  2 ++
 .../service/IXhpcPileEditionService.java      |  3 +-
 .../service/XhpcPileEditionServiceImpl.java   |  5 +++
 .../mapper/XhpcPileEditionMapper.xml          | 31 +++++++++++++++++++
 .../ActivityInternetfAllbackFactory.java      |  4 +--
 .../api/factory/CardFallbackFactory.java      |  2 +-
 .../api/factory/CardHistoryOrderFactory.java  |  2 +-
 ...rgingStationPushStatusFallbackFactory.java |  4 +--
 .../factory/InternetUserFallbackFactory.java  |  2 +-
 .../api/factory/PileOrderFallbackFactory.java | 16 +++++-----
 .../api/factory/PowerPileFallbackFactory.java | 18 +++++------
 .../factory/RefundOrderFallbackFactory.java   |  2 +-
 .../api/factory/SettingConfigFactory.java     |  2 +-
 .../api/factory/SmsFallbackFactory.java       |  2 +-
 .../api/factory/TenantFallbackFactory.java    |  4 +--
 .../api/factory/UserTypeFallbackFactory.java  |  4 +--
 .../api/factory/WebSocketFallbackFactory.java |  2 +-
 .../api/factory/WorkOrderFallbackFactory.java |  4 +--
 .../XhpcPileRegularInspectServiceImpl.java    |  3 +-
 .../mapper/XhpcChargeOrderMapper.xml          | 10 +++++-
 21 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcPileEditionController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcPileEditionController.java
index ea52ff15..21876adc 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcPileEditionController.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcPileEditionController.java
@@ -41,4 +41,9 @@ public class XhpcPileEditionController extends BaseController {
 
         return xhpcPileEditionService.status(pileEditionId,status);
     }
+
+    @GetMapping("/getChargingPileList")
+    public AjaxResult getChargingPileList(@RequestParam(value = "chargingStationId", required = true)Long chargingStationId) {
+        return xhpcPileEditionService.getChargingPileList(chargingStationId);
+    }
 }
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcPileEditionMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcPileEditionMapper.java
index 7aac8285..c23b138d 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcPileEditionMapper.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcPileEditionMapper.java
@@ -28,4 +28,6 @@ public interface XhpcPileEditionMapper {
     int updatePileEdition(XhpcPileEdition xhpcPileEdition);
 
     XhpcPileEdition getXhpcPileEditionById(@Param("pileEditionId")Long pileEditionId);
+
+    List<Map<String, Object>> getChargingPileList(@Param("chargingStationId")Long chargingStationId);
 }
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcPileEditionService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcPileEditionService.java
index 198ba977..192add14 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcPileEditionService.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcPileEditionService.java
@@ -20,8 +20,9 @@ public interface IXhpcPileEditionService {
      */
     List<Map<String, Object>> list(HttpServletRequest request, Long chargingStationId, String chargingPileIds);
 
-
     AjaxResult addPileEdition(HttpServletRequest request, XhpcPileEdition xhpcPileEdition);
 
     AjaxResult status(Long pileEditionId,Integer status);
+
+    AjaxResult getChargingPileList(Long chargingStationId);
 }
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcPileEditionServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcPileEditionServiceImpl.java
index 90413e95..c0b431fe 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcPileEditionServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcPileEditionServiceImpl.java
@@ -116,5 +116,10 @@ public class XhpcPileEditionServiceImpl  extends BaseService implements IXhpcPil
         return AjaxResult.success();
     }
 
+    @Override
+    public AjaxResult getChargingPileList(Long chargingStationId) {
+        return AjaxResult.success(xhpcPileEditionMapper.getChargingPileList(chargingStationId));
+    }
+
 
 }
diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcPileEditionMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcPileEditionMapper.xml
index b57a5f36..68bdd45c 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcPileEditionMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcPileEditionMapper.xml
@@ -171,4 +171,35 @@
     <select id="getXhpcPileEditionById" resultMap="BaseResultMap">
         select * from xhpc_pile_edition where pile_edition_id = #{pileEditionId}
     </select>
+
+    <select id="getChargingPileList" resultType="map">
+        SELECT
+            charging_pile_id as chargingPileName,
+            concat(name,"号桩") as chargingPileName
+        FROM
+            xhpc_charging_pile
+        WHERE
+            charging_station_id = #{chargingStationId}
+          AND charging_pile_id NOT IN (
+            SELECT
+                cp.charging_pile_id AS chargingPileId
+            FROM
+                xhpc_charging_pile AS cp
+            WHERE
+                cp.charging_station_id = #{chargingStationId}
+              AND find_in_set(
+                    cp.charging_pile_id,
+                    (
+                        SELECT
+                            group_concat(charging_pile_ids)
+                        FROM
+                            xhpc_pile_edition
+                        WHERE
+                            charging_station_id = #{chargingStationId}
+                          AND STATUS = 0
+                          AND del_flag = 0
+                    )
+                )
+        )
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ActivityInternetfAllbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ActivityInternetfAllbackFactory.java
index d42690e5..82861a64 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ActivityInternetfAllbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ActivityInternetfAllbackFactory.java
@@ -24,12 +24,12 @@ public class ActivityInternetfAllbackFactory implements FallbackFactory<Activity
        return new ActivityInternetService() {
            @Override
            public R<Map<String, Object>> getActivityStationTime(Long internetUserId, String startTime, String endTime, Long chargingStationId, String tenantId) {
-               return R.fail("获取活动信息失败:" + cause.getMessage());
+               return R.fail(3886,"获取活动信息失败:" + cause.getMessage());
            }
 
            @Override
            public R<Map<String, Object>> getActivityFormulaTime(Integer activityId, String startTime, String endTime) {
-               return R.fail("获取活动时间段信息失败:" + cause.getMessage());
+               return R.fail(3886,"获取活动时间段信息失败:" + cause.getMessage());
            }
        };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java
index 5a711463..9194f04e 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java
@@ -17,7 +17,7 @@ public class CardFallbackFactory implements FallbackFactory<CardService> {
         return new CardService() {
             @Override
             public R cardStartup(String cardno, String serialNumber,String rateModelId) {
-                return R.fail("卡启动判断接口失败:" + cause.getMessage());
+                return R.fail(3886,"卡启动判断接口失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardHistoryOrderFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardHistoryOrderFactory.java
index a162d255..f72ca9fc 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardHistoryOrderFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardHistoryOrderFactory.java
@@ -17,7 +17,7 @@ public class CardHistoryOrderFactory implements FallbackFactory<CardHistoryOrder
         return new CardHistoryOrderService() {
             @Override
             public R cardStartup(Long userId,String serialNumber,Integer userType,String tenantId,Integer type,String grantOperator,String rateModelId) {
-                return R.fail("服务回滚:" + cause.getMessage());
+                return R.fail(3886,"服务回滚:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ChargingStationPushStatusFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ChargingStationPushStatusFallbackFactory.java
index 7b7242e7..f1dc5001 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ChargingStationPushStatusFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/ChargingStationPushStatusFallbackFactory.java
@@ -29,13 +29,13 @@ public class ChargingStationPushStatusFallbackFactory implements FallbackFactory
             @Override
             public AjaxResult editStationStatus(Map<String, Object> map) {
 
-                return AjaxResult.error("场站编辑回调接口失败:" + cause.getMessage());
+                return AjaxResult.error(3886,"场站编辑回调接口失败:" + cause.getMessage());
             }
 
             @Override
             public AjaxResult saveStationStatus(Map<String, Object> map) {
 
-                return AjaxResult.error("场站保存回调接口失败:" + cause.getMessage());
+                return AjaxResult.error(3886,"场站保存回调接口失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/InternetUserFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/InternetUserFallbackFactory.java
index 1bc8c7df..cfcb6776 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/InternetUserFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/InternetUserFallbackFactory.java
@@ -24,7 +24,7 @@ public class InternetUserFallbackFactory implements FallbackFactory<InternetUser
             @Override
             public R getOperatorIdEvcs(String operatorIdEvcs) {
 
-                return R.fail("平台第三方服务发送失败:" + cause.getMessage());
+                return R.fail(3886,"平台第三方服务发送失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
index 4b1027b0..2dc49ed9 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
@@ -24,42 +24,40 @@ public class PileOrderFallbackFactory implements FallbackFactory<PileOrderServic
             @Override
             public R pileStartup(String orderNo, Integer status, String remark) {
 
-                return R.fail("桩启动回调接口失败:" + cause.getMessage());
+                return R.fail(3886,"桩启动回调接口失败:" + cause.getMessage());
             }
 
             @Override
             public R pileStop(String orderNo, Integer status, String remark) {
 
-                return R.fail("桩停止回调接口失败:" + cause.getMessage());
+                return R.fail(3886,"桩停止回调接口失败:" + cause.getMessage());
             }
 
             @Override
             public R pileEndOrder(String orderNo) {
 
-                return null;
+                return R.fail(3886,"桩订单结束回调接口失败:" + cause.getMessage());
             }
 
             @Override
             public R pileRimeOrder(String orderNo) {
 
-                return R.fail("桩实时订单回调接口失败:" + cause.getMessage());
+                return R.fail(3886,"桩实时订单回调接口失败:" + cause.getMessage());
             }
 
             @Override
             public R abnormalOrder(String orderNo) {
-
-                return R.fail("订单异常回调接口失败:" + cause.getMessage());
+                return R.fail(3886,"订单异常回调接口失败:" + cause.getMessage());
             }
 
             @Override
             public R pileStartUpBy3rd(String internetSerialNumber, String driverId, Integer chargingAmt, String plateNum, Integer status, String connectorId) {
-
-                return R.fail("互联网订单启动失败:" + cause.getMessage());
+                return R.fail(3886,"互联网订单启动失败:" + cause.getMessage());
             }
 
             @Override
             public R pileVin(String serialNumber, String vinNumber) {
-                return R.fail("VIN码启动失败:" + cause.getMessage());
+                return R.fail(3886,"VIN码启动失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java
index 8daf7229..79237688 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java
@@ -25,55 +25,55 @@ public class PowerPileFallbackFactory implements FallbackFactory<PowerPileServic
             @Override
             public R startCharging(StartChargingData startChargingData) {
 
-                return R.fail("启动充电失败:" + cause.getMessage());
+                return R.fail(3886,"启动充电失败:" + cause.getMessage());
             }
 
             @Override
             public R refreshBalance(StartChargingData balanceRefreshData) {
 
-                return R.fail("刷新余额失败:" + cause.getMessage());
+                return R.fail(3886,"刷新余额失败:" + cause.getMessage());
             }
 
             @Override
             public R stopCharging(String orderNo, String pileNo, String connectorId, String version) {
 
-                return R.fail("停止充电失败:" + cause.getMessage());
+                return R.fail(3886,"停止充电失败:" + cause.getMessage());
             }
 
             @Override
             public R addPileWhitelist(Long stationId, String version, Set<String> pileNoSet) {
 
-                return R.fail("增加充电桩白名单失败:" + cause.getMessage());
+                return R.fail(3886,"增加充电桩白名单失败:" + cause.getMessage());
             }
 
             @Override
             public R deletePileWhitelist(Long stationId, Set<String> pileNoSet) {
 
-                return R.fail("删除充电桩白名单失败:" + cause.getMessage());
+                return R.fail(3886,"删除充电桩白名单失败:" + cause.getMessage());
             }
 
             @Override
             public R setStationRateModel(Long stationId, Long rateModelId, CacheRateModel rateModel) {
 
-                return R.fail("设置电站费率模型失败:" + cause.getMessage());
+                return R.fail(3886,"设置电站费率模型失败:" + cause.getMessage());
             }
 
             @Override
             public R configTimeNRateModel(String pileNo) {
 
-                return R.fail("校时校费失败:" + cause.getMessage());
+                return R.fail(3886,"校时校费失败:" + cause.getMessage());
             }
 
             @Override
             public R pileSoftwareUpgrade(String pileNo) {
 
-                return R.fail("更新桩程序失败:" + cause.getMessage());
+                return R.fail(3886,"更新桩程序失败:" + cause.getMessage());
             }
 
             @Override
             public R pileReboot(String pileNo) {
 
-                return R.fail("重启桩程序失败:" + cause.getMessage());
+                return R.fail(3886,"重启桩程序失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/RefundOrderFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/RefundOrderFallbackFactory.java
index 84267b2f..662512ac 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/RefundOrderFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/RefundOrderFallbackFactory.java
@@ -23,7 +23,7 @@ public class RefundOrderFallbackFactory implements FallbackFactory<RefundOrderSe
         return new RefundOrderService() {
             @Override
             public R sendNotice(String amount, String openid, Integer source, String type, String userId,String tenantId,String remark) {
-                return R.fail("自动申请退款失败:" + cause.getMessage());
+                return R.fail(3886,"自动申请退款失败:" + cause.getMessage());
             }
         };
 
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SettingConfigFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SettingConfigFactory.java
index bf072df1..c4118535 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SettingConfigFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SettingConfigFactory.java
@@ -18,7 +18,7 @@ public class SettingConfigFactory implements FallbackFactory<SettingConfigServic
         return new SettingConfigService() {
             @Override
             public R settingConfig(Integer status, String tenantId) {
-                return R.fail("获取支付配置信息失败:" + cause.getMessage());
+                return R.fail(3886,"获取支付配置信息失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SmsFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SmsFallbackFactory.java
index 0156a7f1..e7dbaaa5 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SmsFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/SmsFallbackFactory.java
@@ -25,7 +25,7 @@ public class SmsFallbackFactory implements FallbackFactory<SmsService> {
             @Override
             public R sendNotice(Map<String, String> paramMap) {
 
-                return R.fail("短信发送失败:" + cause.getMessage());
+                return R.fail(3886,"短信发送失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/TenantFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/TenantFallbackFactory.java
index f69991dc..cc39a5ff 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/TenantFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/TenantFallbackFactory.java
@@ -16,13 +16,13 @@ public class TenantFallbackFactory implements FallbackFactory<TenantService> {
         return new TenantService() {
             @Override
             public R gettenantIdTime(String tenantId) {
-                return R.fail("租户服务发送失败:" + cause.getMessage());
+                return R.fail(3886,"租户服务发送失败:" + cause.getMessage());
             }
 
 
             @Override
             public R getTenantDetail(String tenantId) {
-                return R.fail("租户服务发送失败:" + cause.getMessage());
+                return R.fail(3886,"租户服务发送失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/UserTypeFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/UserTypeFallbackFactory.java
index 633a1177..1f8ea4e7 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/UserTypeFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/UserTypeFallbackFactory.java
@@ -23,12 +23,12 @@ public class UserTypeFallbackFactory implements FallbackFactory<UserTypeService>
         return new UserTypeService() {
             @Override
             public R getUser(String phone, Long userId, Integer userType,String serialNumber,String tenantId) {
-                return R.fail("用户信息获取失败:" + cause.getMessage());
+                return R.fail(3886,"用户信息获取失败:" + cause.getMessage());
             }
 
             @Override
             public R insertUserBalance(BigDecimal money,Long userId, Integer userType, String tenantId, Integer type,Integer status,String remark,Long moneyOrderId) {
-                return R.fail("添加用户金额信息失败:" + cause.getMessage());
+                return R.fail(3886,"添加用户金额信息失败:" + cause.getMessage());
             }
 
             @Override
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java
index f28c8c8e..229aeb3c 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java
@@ -23,7 +23,7 @@ public class WebSocketFallbackFactory implements FallbackFactory<WebSocketServic
         return new WebSocketService() {
             @Override
             public R getMessage(String userId, String message) {
-                return R.fail("消息发送调用失败:" + cause.getMessage());
+                return R.fail(3886,"消息发送调用失败:" + cause.getMessage());
             }
         };
     }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WorkOrderFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WorkOrderFallbackFactory.java
index 7be746eb..eddc6ecd 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WorkOrderFallbackFactory.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WorkOrderFallbackFactory.java
@@ -25,12 +25,12 @@ public class WorkOrderFallbackFactory implements FallbackFactory<WorkOrderYuServ
         return new WorkOrderYuService() {
             @Override
             public R addNewOrder(String type, String title, String content, String reason,String stationId,String deviceType,String serialNumber) {
-                return R.fail("工单生成失败调用失败:" + cause.getMessage());
+                return R.fail(3886,"工单生成失败调用失败:" + cause.getMessage());
             }
 
             @Override
             public R workOrderMessage(Integer type, String time) {
-                return R.fail("工单查询调用失败:" + cause.getMessage());
+                return R.fail(3886,"工单查询调用失败:" + cause.getMessage());
             }
 
         };
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java
index 6f27231b..95fdc83c 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java
@@ -133,7 +133,8 @@ public class XhpcPileRegularInspectServiceImpl extends BaseService implements IX
                 return AjaxResult.error(500, "请重新登录");
             }
         }catch (Exception e){
-            return AjaxResult.error(500, "费率格式不对");
+            e.printStackTrace();
+            return AjaxResult.error(500, "服务器开小差了，请联系管理员");
         }
     }
 
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
index f9efbd28..3eaaa3ad 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
@@ -727,6 +727,14 @@
     </select>
 
     <select id="getSerialNumberOrder" resultType="map">
-        select max(charge_order_id),serial_number serialNumber from xhpc_charge_order where terminal_id = (select terminal_id from xhpc_terminal where serial_number=#{serialNumber} and del_flag =0)
+        SELECT
+            serial_number serialNumber
+        FROM
+            xhpc_charge_order
+        WHERE
+            charge_order_id = (
+            SELECT MAX(charge_order_id) FROM xhpc_charge_order WHERE terminal_id = (
+                SELECT terminal_id  FROM xhpc_terminal WHERE serial_number =#{serialNumber} AND del_flag = 0 )
+            )
     </select>
 </mapper>