Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -128,6 +128,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     NB_BANK_NOTIFY_ERROR(1801, "宁波银行回调失败"),
     NB_BANK_PAY_TYPE_ERROR(1802, "支付方式不支持"),
     NB_BANK_ORDER_PAY_ERROR(1803, "宁波银行订单支付失败"),
+    NB_BANK_NO_MONEY_ERROR(1804, "账户余额不足"),
 
     PLATFORM_ACCOUNT_CONFIG_ONLY(1913, "当前配置已存在"),
     PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_IS_NULL(1914, "提现平台账户未配置"),

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -457,13 +457,18 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject data = responseJson.getJSONObject("data");
 
-            if (!StringUtils.equals(data.getString("errorCode"), "000000")){
+            if (!StringUtils.equals(data.getString("errorCode"), "PAY888")){
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_NO_MONEY_ERROR);
+            }
+            else if (!StringUtils.equals(data.getString("errorCode"), "000000")){
                 log.info("宁波银行, 调账接口(fundTransferOrder), code:{}, msg:{}", data.getString("errorCode"), data.getString("errorMsg"));
                 throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
             }
 
             return data;
         } catch (Exception e) {
+            if (e instanceof ServiceSystemException) {throw (ServiceSystemException)e;}
+
             log.info("宁波银行接口异常:{}", ExceptionUtils.getStackTrace(e));
         }