[modify buyer]

zhangxing
1 parent f8a64fa5
Showing 4 changed files with 62 additions and 47 deletions
src/main/java/com/diligrp/xtrade/order/domain/emuns/OrderStatus.java
src/main/java/com/diligrp/xtrade/order/exception/OrderException.java
src/main/java/com/diligrp/xtrade/order/service/impl/OrderServiceImpl.java
src/main/java/com/diligrp/xtrade/product/exception/ExceptionEnum.java
@@ -11,7 +11,9 @@ public enum OrderStatus {
 	/**
 	 * 未支付
 	 */
-	UNPAIED(1, "未支付");
+	UNPAIED(1, "未支付"),
+	
+	PAIED(3, "未支付");
 	// 编码
 	private int code;
-package com.diligrp.xtrade.order.exception;
-
-public class OrderException extends RuntimeException{
-
-	private static final long serialVersionUID = 1L;
-	
-	private static final int DEFAULT_CODE = 1000;
-	
-	private int code;
-	
-	public OrderException() {
-		super();
-	}
-	
-	public OrderException(String message, int code){
-		super(message);
-		this.code = code;
-	}
-	
-	public OrderException(String message) {
-		this(message, DEFAULT_CODE);
-	}
-	
-	public OrderException(String message, Throwable cause) {
-		super(message, cause);
-		this.code = DEFAULT_CODE;
-	}
-	
-	public OrderException(Throwable cause) {
-		super(cause);
-		this.code = DEFAULT_CODE;
-	}
-
-	public int getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-	
-}
+package com.diligrp.xtrade.order.exception;
+
+public class OrderException extends RuntimeException{
+
+	private static final long serialVersionUID = 1L;
+	
+	private static final int DEFAULT_CODE = 1000;
+	
+	private int code;
+	
+	public OrderException() {
+		super();
+	}
+	
+	public OrderException(String message, int code){
+		super(message);
+		this.code = code;
+	}
+	
+	public OrderException(OrderError orderError){
+		super(orderError.getName());
+		this.code = orderError.getCode();
+	}
+	
+	public OrderException(String message) {
+		this(message, DEFAULT_CODE);
+	}
+	
+	public OrderException(String message, Throwable cause) {
+		super(message, cause);
+		this.code = DEFAULT_CODE;
+	}
+	
+	public OrderException(Throwable cause) {
+		super(cause);
+		this.code = DEFAULT_CODE;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+	
+}
@@ -19,7 +19,10 @@ import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
 import com.diligrp.xtrade.order.domain.dto.OrderRequestDto;
 import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
 import com.diligrp.xtrade.order.domain.emuns.IdGenerator;
+import com.diligrp.xtrade.order.domain.emuns.OrderStatus;
 import com.diligrp.xtrade.order.domain.entity.OrderDo;
+import com.diligrp.xtrade.order.exception.OrderError;
+import com.diligrp.xtrade.order.exception.OrderException;
 import com.diligrp.xtrade.order.rpc.feign.AccountResolver;
 import com.diligrp.xtrade.order.service.OrderService;
 import com.diligrp.xtrade.shared.domain.Page;
@@ -66,11 +69,18 @@ public class OrderServiceImpl implements OrderService {
 		orderDao.insertEntity(defaultOrderCreator.createOrder());
 	}
-
+	// TODO need modify because of change
 	@Override
 	public void updateBuyer(OrderRequestDto orderRequestDto) {
 		OrderDo orderDo = orderDao.selectEntityByOrderId(orderRequestDto.getOrderId());
-		
+		if (orderDo == null ) {
+			throw new OrderException(OrderError.ORDER_NOT_EXIST);
+		}
+		if (orderDo.getOrderStatus() == OrderStatus.PAIED.getCode()) {
+			throw new OrderException(OrderError.ORDER_IS_PAIED);
+		}
+		AccountDto baccountDto = accountResolver.getAccount(orderRequestDto.getBaccount());
+		//TODO
 	}
 	// TODO need modify because of change
@@ -2,8 +2,6 @@ package com.diligrp.xtrade.product.exception;
 import java.util.Arrays;
-import javax.validation.constraints.NotBlank;
-
 import com.diligrp.xtrade.shared.type.IEnumType;
 /**