Browse Source

fixed 多语言版本代码质量优化

fushengqian 2 days ago
parent
commit
59c3d00d5d

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java

@@ -258,7 +258,7 @@ public class BackendBalanceController extends BaseController {
             return getFailureResult(201, "充值规则设置不能为空");
         }
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作,请使用商户帐号操作");
+            return getFailureResult(5002);
         }
 
         String rechargeRule = "";

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBookCateController.java

@@ -159,7 +159,7 @@ public class BackendBookCateController extends BaseController {
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作,请使用商户帐号操作");
+            return getFailureResult(5002);
         }
 
         MtBookCate mtBookCate = new MtBookCate();

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBookController.java

@@ -188,7 +188,7 @@ public class BackendBookController extends BaseController {
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作,请使用商户帐号操作");
+            getFailureResult(5002);
         }
 
         MtBook mtBook = new MtBook();

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberGroupController.java

@@ -112,7 +112,7 @@ public class BackendMemberGroupController extends BaseController {
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作,请使用商户帐号操作");
+            return getFailureResult(5002);
         }
 
         memberGroupDto.setMerchantId(accountInfo.getMerchantId());

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java

@@ -186,7 +186,7 @@ public class BackendPointController extends BaseController {
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作,请使用商户帐号操作");
+            return getFailureResult(5002);
         }
 
         String operator = accountInfo.getAccountName();

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsController.java

@@ -153,7 +153,7 @@ public class BackendSmsController extends BaseController {
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作,请使用商户帐号操作");
+            return getFailureResult(5002);
         }
         SmsSettingEnum[] settingList = SmsSettingEnum.values();
         for (SmsSettingEnum setting : settingList) {

+ 1 - 2
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -118,7 +118,6 @@ public class BackendStaffController extends BaseController {
         Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-
         staffService.updateAuditedStatus(id, status, accountInfo.getAccountName());
         return getSuccessResult(true);
     }
@@ -137,7 +136,7 @@ public class BackendStaffController extends BaseController {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作,请使用商户帐号操作");
+            return getFailureResult(5002);
         }
 
         MtStaff mtStaff = new MtStaff();

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -131,7 +131,7 @@ public class ClientCartController extends BaseController {
             if (accountInfo != null) {
                 merchantId = accountInfo.getMerchantId();
                 if (merchantId == null || merchantId <= 0) {
-                    return getFailureResult(201, "平台方账户无操作权限");
+                    return getFailureResult(5002);
                 }
             }
         }

+ 2 - 0
fuint-application/src/main/resources/international/message_en_US.properties

@@ -13,6 +13,7 @@ response.error.1003=\u5361\u5238\u6838\u9500\u5931\u8D25
 response.error.1004=\u60A8\u6CA1\u6709\u8BBF\u95EE\u6743\u9650
 response.error.1005=\u5361\u5238\u72B6\u6001\u5F02\u5E38
 response.error.1006=\u5361\u5238\u9886\u53D6\u5931\u8D25
+response.error.1007=\u60A8\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
 response.error.2000=\u7CFB\u7EDF\u51FA\u9519\u5566
 response.error.2001=\u4F1A\u5458\u6CE8\u518C\u5931\u8D25
 response.error.3000=\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E\u5F02\u5E38
@@ -20,3 +21,4 @@ response.error.3002=\u77ED\u4FE1\u9A8C\u8BC1\u7801\u6709\u8BEF
 response.error.3008=\u8F6C\u589E\u5931\u8D25
 response.error.4000=\u60A8\u6CA1\u6709\u6536\u94F6\u6743\u9650
 response.error.5001=\u4F1A\u5458\u4F59\u989D\u4E0D\u8DB3
+response.error.5002=\u5E73\u53F0\u65B9\u5E10\u53F7\u65E0\u6CD5\u6267\u884C\u8BE5\u64CD\u4F5C\uFF0C\u8BF7\u4F7F\u7528\u5546\u6237\u5E10\u53F7\u64CD\u4F5C

+ 2 - 0
fuint-application/src/main/resources/international/message_zh_CN.properties

@@ -13,6 +13,7 @@ response.error.1003=\u5361\u5238\u6838\u9500\u5931\u8D25
 response.error.1004=\u60A8\u6CA1\u6709\u8BBF\u95EE\u6743\u9650
 response.error.1005=\u5361\u5238\u72B6\u6001\u5F02\u5E38
 response.error.1006=\u5361\u5238\u9886\u53D6\u5931\u8D25
+response.error.1007=\u60A8\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
 response.error.2000=\u7CFB\u7EDF\u51FA\u9519\u5566
 response.error.2001=\u4F1A\u5458\u6CE8\u518C\u5931\u8D25
 response.error.3000=\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E\u5F02\u5E38
@@ -20,4 +21,5 @@ response.error.3002=\u77ED\u4FE1\u9A8C\u8BC1\u7801\u6709\u8BEF
 response.error.3008=\u8F6C\u589E\u5931\u8D25
 response.error.4000=\u60A8\u6CA1\u6709\u6536\u94F6\u6743\u9650
 response.error.5001=\u4F1A\u5458\u4F59\u989D\u4E0D\u8DB3
+response.error.5002=\u5E73\u53F0\u65B9\u5E10\u53F7\u65E0\u6CD5\u6267\u884C\u8BE5\u64CD\u4F5C\uFF0C\u8BF7\u4F7F\u7528\u5546\u6237\u5E10\u53F7\u64CD\u4F5C