From e021502051079ac2b2c2adcea60b9ec01556b7fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 九月 2024 11:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
index 7dc0cf8..ef8f6fa 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/result/SellResultCode.java
@@ -19,6 +19,7 @@
     AREA_CODE_MISTAKE(10001, "璇ュ啘鎴疯鏀垮尯鍒掑紓甯�"),
     CLIENT_NUM_ERROR(10001, "鍐滄埛缂栧彿閿欒"),
     CARD_NUMBER_OVERRUN(10002, "姘村崱缂栧彿宸叉弧"),
+    ACTIVE_FAIL_CARD_ESIST(10005, "寮�鍗″け璐�-姝ゅ崱宸插瓨鍦�"),
     ACTIVE_FAIL_WRITE_CLIENT_CARD_ERROR(10003, "寮�鍗″け璐�-鍐滄埛鍗″啓鍏ュ紓甯�"),
     ACTIVE_FAIL_WRITE_ACTIVE_CARD_ERROR(10004, "寮�鍗″け璐�-寮�鍗¤褰曞啓鍏ュ紓甯�"),
     ACTIVE_FAIL_RECHARGE_EXCEPTION(10005, "寮�鍗″け璐�-鍏呭�煎紓甯�"),
@@ -76,9 +77,11 @@
      * 鎬昏处
      */
     GENERAL_ID_CANNOT_BE_NULL(80001, "鎬昏处缂栧彿涓嶈兘涓虹┖"),
-    GENERAL_NOT_EXIST(80001, "鎬昏处涓嶅瓨鍦�"),
-    GENERAL_AUDIT_FAIL(80001, "鎬昏处瀹℃牳澶辫触"),
-    AUDITS_ADD_FAIL(80001, "鎬昏处瀹℃牳璁板綍娣诲姞澶辫触"),
+    GENERAL_NOT_EXIST(80002, "鎬昏处涓嶅瓨鍦�"),
+    GENERAL_AUDIT_FAIL(80003, "鎬昏处瀹℃牳澶辫触"),
+    AUDITS_ADD_FAIL(80004, "鎬昏处瀹℃牳璁板綍娣诲姞澶辫触"),
+    GENERAL_IS_NULL(80005, "瑕佸鍑虹殑鎬昏处涓虹┖"),
+    TRADE_DETAILS_IS_NULL(80006, "瑕佸鍑虹殑浜ゆ槗鏄庣粏涓虹┖"),
 
     /**
      * 铏氭嫙鍗�

--
Gitblit v1.8.0