优化

miaoguoxin
1 parent 9a830fa9
Showing 3 changed files with 54 additions and 87 deletions
src/main/java/com/diligrp/xtrade/product/domain/emuns/ResponseCode.java
src/main/java/com/diligrp/xtrade/product/exception/ExceptionEnum.java
src/main/java/com/diligrp/xtrade/product/service/impl/MerchantServiceImpl.java
-package com.diligrp.xtrade.product.domain.emuns;
-
-import com.diligrp.xtrade.shared.type.IEnumType;
-
-/**
- * @Auther: miaoguoxin
- * @Date: 2020/4/22 08:48
- * @Description: 响应code枚举
- */
-public enum ResponseCode implements IEnumType {
-    ACCOUNT_EXIST(200001,"账号已存在"),
-    CARD_MERCHANT_CREATED(200002,"该卡已创建商户，请使用用户名密码登录"),
-    ;
-
-
-    private int code;
-    private String name;
-
-    ResponseCode(int code,String name)
-    {
-        this.name = name;
-        this.code = code;
-    }
-
-    @Override
-    public int getCode() {
-        return this.code;
-    }
-
-    @Override
-    public String getName() {
-        return this.name;
-    }
-}
-package com.diligrp.xtrade.product.exception;
-
-import java.util.Arrays;
-
-import com.diligrp.xtrade.shared.type.IEnumType;
-
-/**
- * @ClassName: ExceptionEnum
- * @Description TODO(用一句话描述该文件做什么)
- * @author yangfan
- * @date 2020年4月22日
- */
-public enum ExceptionEnum implements IEnumType {
-	SHOP_NOT_EXISTENCE(20001, "SHOP_NOT_EXISTENCE");
-
-	private int code;
-	private String name;
-
-	ExceptionEnum(int code, String name) {
-		this.code = code;
-		this.name = name;
-	}
-
-	public static ExceptionEnum getByType(int code) {
-        return Arrays.stream(values())
-                .filter(exceptionEnum -> exceptionEnum.getCode() == code)
-                .findFirst()
-                .orElse(null);
-    }
-
-    public static String getName(int index) {
-        return Arrays.stream(ExceptionEnum.values())
-                .filter(c -> c.getCode() == index)
-                .findFirst().map(c -> c.name)
-                .orElse(null);
-    }
-
-	
-	public int getCode() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public String getName() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
+package com.diligrp.xtrade.product.exception;
+
+import java.util.Arrays;
+
+import com.diligrp.xtrade.shared.type.IEnumType;
+
+/**
+ * @ClassName: ExceptionEnum
+ * @Description 异常响应
+ * @author yangfan
+ * @date 2020年4月22日
+ */
+public enum ExceptionEnum implements IEnumType {
+	SHOP_NOT_EXISTENCE(200001, "SHOP_NOT_EXISTENCE"),
+	MERCHANT_ACCOUNT_EXIST(200002,"商户账号已存在"),
+	CARD_MERCHANT_CREATED(200003,"该卡已创建商户，请使用用户名密码登录"),
+	;
+
+	private int code;
+	private String name;
+
+	ExceptionEnum(int code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+	public static ExceptionEnum getByType(int code) {
+        return Arrays.stream(values())
+                .filter(exceptionEnum -> exceptionEnum.getCode() == code)
+                .findFirst()
+                .orElse(null);
+    }
+
+    public static String getName(int index) {
+        return Arrays.stream(ExceptionEnum.values())
+                .filter(c -> c.getCode() == index)
+                .findFirst().map(c -> c.name)
+                .orElse(null);
+    }
+
+
+	public int getCode() {
+		return this.code;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+}
@@ -4,10 +4,10 @@ import com.diligrp.xtrade.product.domain.builder.MerchantBuilder;
 import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
 import com.diligrp.xtrade.product.domain.dto.MerchantResponseDto;
 import com.diligrp.xtrade.product.domain.emuns.AccountType;
-import com.diligrp.xtrade.product.domain.emuns.ResponseCode;
 import com.diligrp.xtrade.product.domain.entity.AccountDo;
 import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import com.diligrp.xtrade.product.domain.entity.OperatorDo;
+import com.diligrp.xtrade.product.exception.ExceptionEnum;
 import com.diligrp.xtrade.product.exception.ProductException;
 import com.diligrp.xtrade.product.repository.IAccountRepository;
 import com.diligrp.xtrade.product.repository.IMerchantRepository;
@@ -34,7 +34,7 @@ public class MerchantServiceImpl implements MerchantService {
         requestDto.setRealName(operatorDo.getName());
         AccountDo accountDo = accountRepository.getAccountByName(requestDto.getAccountName());
         if (accountDo != null) {
-            throw new ProductException(ResponseCode.ACCOUNT_EXIST);
+            throw new ProductException(ExceptionEnum.MERCHANT_ACCOUNT_EXIST);
         }
         MerchantDo merchantDo = merchantRepository.getByAccountId(requestDto.getAccountId());
         if (merchantDo == null){
@@ -42,7 +42,7 @@ public class MerchantServiceImpl implements MerchantService {
             merchantRepository.add(merchantDo);
         } else {
             if (AccountType.PERSONAL.getCode() != merchantDo.getType()){
-                throw new ProductException(ResponseCode.CARD_MERCHANT_CREATED);
+                throw new ProductException(ExceptionEnum.CARD_MERCHANT_CREATED);
             }
             merchantRepository.update(merchantDo);
         }