Merge branch 'v10.7_borrowing_and_repayment_20240118' into release

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

@@ -136,6 +136,11 @@ public enum PerformanceResultEnum implements ResultEnum {
     NB_BANK_PAY_TYPE_ERROR(1802, "支付方式不支持"),
     NB_BANK_ORDER_PAY_ERROR(1803, "宁波银行订单支付失败"),
     NB_BANK_NO_MONEY_ERROR(1804, "账户余额不足"),
+    NB_BANK_PAY_DISABLE_ERROR(1805, "商户未开通相关支付方式"),
+    NB_BANK_ACCOUNT_NOT_FOUND_ERROR(1806, "账户信息不存在"),
+    NB_BANK_MERCHANT_STATUS_ERROR(1807, "商户信息不存在或商户状态异常"),
+    NB_BANK_AMOUNT_OUT_OF_RANGE_ERROR(1807, "明细金额超限"),
+    NB_BANK_NAME_BANK_NO_MISSMATCH_ERROR(1808, "账户名称与银行记录不符"),
 
     GET_LOAN_RECORD(1901, "货主借款失败"),
     OWNER_ACCOUNT_ERROR(1902, "货主货款不足"),

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java

@@ -363,7 +363,10 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
     @Transactional(rollbackFor = Exception.class)
     public void adjust(Integer id) {
         OwnerRepayment ownerRepayment = ownerRepaymentDao.getEntityByKey(id).orElseThrow(ResultEnum.DATA_NOT_FIND);
-        if (!ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAYING.getCode())) {
+        if (!ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAYING.getCode())
+            ||
+             !ownerRepayment.getStatus().equals(OwnerRePaymentEnum.Status.PAY_FAIL.getCode())
+        ) {
             log.info("还款记录状态异常,不是付款中，不能核销");
             throw new ServiceSystemException(PerformanceResultEnum.OWNER_LOAN_RECORD_ADJUST_STATUS_ERROR);
         }

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

@@ -257,7 +257,22 @@ 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"), "MER006")){
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_PAY_DISABLE_ERROR);
+            }
+            else if (StringUtils.equals(data.getString("errorCode"), "BP3233")){
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_ACCOUNT_NOT_FOUND_ERROR);
+            }
+            else if (StringUtils.equals(data.getString("errorCode"), "MER001")){
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_MERCHANT_STATUS_ERROR);
+            }
+            else if (StringUtils.equals(data.getString("errorCode"), "BD2103")){
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_AMOUNT_OUT_OF_RANGE_ERROR);
+            }
+            else if (StringUtils.equals(data.getString("errorCode"), "BP3212")){
+                throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_NAME_BANK_NO_MISSMATCH_ERROR);
+            }
+            else if (!StringUtils.equals(data.getString("errorCode"), "000000")){
                 log.info("宁波银行, 下单失败(unionPayDirectOrder), code:{}, msg:{}", data.getString("errorCode"), data.getString("errorMsg"));
                 throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
             }
@@ -265,6 +280,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             return data;
 
         } catch (Exception e) {
+            if (e instanceof ServiceSystemException) {throw (ServiceSystemException)e;}
             log.info("宁波银行接口异常:{}", ExceptionUtils.getStackTrace(e));
         }