update buyer

zhangxing
1 parent 628d2af8
Showing 3 changed files with 68 additions and 8 deletions
src/main/java/com/diligrp/xtrade/order/dao/OrderDao.java
src/main/java/com/diligrp/xtrade/order/exception/OrderError.java
src/main/java/com/diligrp/xtrade/order/service/impl/OrderServiceImpl.java
@@ -66,8 +66,8 @@ public interface OrderDao {
 	 * @return
 	 * @throws
 	 */
-	int updateBuyerInfo(@Param("baccount") Long baccount, @Param("bcardNo") Long bcardNo,
-			@Param("bcardType") Long bcardType, @Param("bname") Long bname, @Param("bmobile") Long bmobile);
+	int updateBuyerInfo(@Param("baccount") Long baccount, @Param("bcardNo") String bcardNo,
+			@Param("bcardType") Integer bcardType, @Param("bname") String bname, @Param("bmobile") String bmobile);
 	/**
 	 * 
+package com.diligrp.xtrade.order.exception;
+
+import java.util.Arrays;
+
+import com.diligrp.xtrade.shared.type.IEnumType;
+
+/**
+ * 订单错误信息描述
+ */
+public enum OrderError implements IEnumType{
+	
+	ORDER_NOT_EXIST(300001, "订单不存在"),
+	ORDER_IS_PAIED(300002, "订单已支付"),
+	ORDER_IS_CLOSED(300003, "订单已关闭"),
+	SELLER_EQUAL_BUYER(300004, "买卖家相同");
+	
+	private int code;
+	private String name;
+	
+	OrderError(int code, String name) {
+		this.setCode(code);
+		this.name = name;
+	}
+
+	public static OrderError getByType(int code) {
+        return Arrays.stream(values())
+                .filter(e -> e.getCode() == code)
+                .findFirst()
+                .orElse(null);
+    }
+
+    public static String getName(int index) {
+        return Arrays.stream(OrderError.values())
+                .filter(e -> e.getCode() == index)
+                .findFirst().map(e -> e.name)
+                .orElse(null);
+    }
+
+
+	@Override
+	public int getCode() {
+		return this.code;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+	
+}
@@ -68,19 +68,25 @@ 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 ) {
+		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
+
+		AccountDto buyer = accountResolver.getAccount(orderRequestDto.getBaccount());
+		if (orderDo.getSaccount().equals(orderRequestDto.getBaccount())
+				|| orderDo.getSaccount().equals(buyer.getParentAccountId())) {
+			throw new OrderException(OrderError.SELLER_EQUAL_BUYER);
+		}
+		orderDao.updateBuyerInfo(buyer.getAccountId(), buyer.getCardNo(), buyer.getType(), buyer.getAccountName(),
+				buyer.getMobile());
 	}
 	// TODO need modify because of change
@@ -107,8 +113,8 @@ public class OrderServiceImpl implements OrderService {
 	// TODO need modify because of change
 	@Override
 	public OrderResponseDto orderDetail(Long orderId) {
-		OrderResponseDto orderResponseDto = OrderDataBuilder
-				.buildOrderDetail(orderDao.selectEntityByOrderId(orderId), orderItemDao.selectItemsByOrderId(orderId));
+		OrderResponseDto orderResponseDto = OrderDataBuilder.buildOrderDetail(orderDao.selectEntityByOrderId(orderId),
+				orderItemDao.selectItemsByOrderId(orderId));
 		return orderResponseDto;
 	}