Merge branch 'master' of http://git3.nong12.com/xtrade/order-service

yangfan
2 parents cce2ed15 3e9131cc
Showing 5 changed files with 108 additions and 47 deletions
src/main/java/com/diligrp/xtrade/order/domain/builder/DefaultOrderBuilder.java → src/main/java/com/diligrp/xtrade/order/domain/builder/DefaultOrderCreator.java
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderCreateRequestDto.java
src/main/java/com/diligrp/xtrade/order/domain/entity/OrderDo.java
src/main/java/com/diligrp/xtrade/order/service/impl/OrderServiceImpl.java
src/main/resources/mapping/com/diligrp/xtrade/product/MerchantDao.xml
@@ -2,9 +2,11 @@ package com.diligrp.xtrade.order.domain.builder;
  
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.List;
  
 import com.diligrp.xtrade.order.domain.dto.AccountDto;
+import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
 import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
 import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
 import com.diligrp.xtrade.order.domain.emuns.OrderType;
@@ -20,32 +22,53 @@ import com.diligrp.xtrade.order.exception.OrderException;
  * @author zhangxing
  * @date 2020年4月21日
  */
-public class DefaultOrderBuilder {
+public class DefaultOrderCreator {
+
+	private OrderDo orderDo = new OrderDo();
+
+	private List<OrderItemDo> items = new ArrayList<OrderItemDo>();
+	
+	private AccountDto saccountDto;
+	
+	private OrderCreateRequestDto orderCreateDto;
+	
+	public DefaultOrderCreator() {
+	}
+	
+	public DefaultOrderCreator(AccountDto saccountDto, OrderCreateRequestDto orderCreateDto) {
+		this.saccountDto = saccountDto;
+		this.orderCreateDto = orderCreateDto;
+	}
  
+	public static DefaultOrderCreator builder(AccountDto saccountDto, OrderCreateRequestDto orderCreateDto, Long orderId) {
+		orderCreateDto.setOrderId(orderId);
+		return new DefaultOrderCreator(saccountDto, orderCreateDto);
+	}
+
 	/**
-	 * 构建初始订单数据  TODO need modify because of change
+	 * 构建初始订单数据 TODO need modify because of change
 	 */
-	public static OrderDo initializeOrderBaseData(Long orderId, AccountDto saccountDto, Integer createSrc) {
-		OrderDo order = new OrderDo();
-		order.setOrderId(orderId);
-		order.setBaccount(saccountDto.getAccountId());
-		order.setSname(saccountDto.getAccountName());
-		order.setSmobile(saccountDto.getMobile());
-		order.setScardType(saccountDto.getType());
-		order.setCreatedSrc(createSrc);
-		order.setOrderType(OrderType.NORMAL.getCode());
-		order.setTradeType(TradeType.NORMAL.getCode());
-		order.setMarketCode("SYDEV");
-		return order;
+	public void initializeOrderBaseData() {
+		OrderDo orderDo = new OrderDo();
+		orderDo.setOrderId(orderCreateDto.getOrderId());
+		orderDo.setBaccount(saccountDto.getAccountId());
+		orderDo.setSname(saccountDto.getAccountName());
+		orderDo.setSmobile(saccountDto.getMobile());
+		orderDo.setScardType(saccountDto.getType());
+		orderDo.setCreatedSrc(orderCreateDto.getCreatedSrc());
+		orderDo.setOrderType(OrderType.NORMAL.getCode());
+		orderDo.setTradeType(TradeType.NORMAL.getCode());
+		orderDo.setMarketCode("SYDEV");
+		this.setOrderDo(orderDo);
 	}
-	
+
 	/**
 	 * 订单详情初始化数据 TODO need modify because of change
 	 */
-	public static OrderItemDo initializeItemData(Long itemId, Long orderId, OrderItemDto orderItem){
+	public void initializeItemData(Long itemId, OrderItemDto orderItem) {
 		OrderItemDo orderItemDo = new OrderItemDo();
 		orderItemDo.setItemId(itemId);
-		orderItemDo.setOrderId(orderId);
+		orderItemDo.setOrderId(orderDo.getOrderId());
 		orderItemDo.setProductId(orderItem.getPid());
 		orderItemDo.setProductName(orderItem.getPname());
 		// 销售单价
@@ -69,16 +92,50 @@ public class DefaultOrderBuilder {
 		orderItemDo.setWeight(tempWeight.doubleValue());
 		Long itemMoney = price.multiply(amount).setScale(0, RoundingMode.HALF_UP).longValue();
 		orderItemDo.setMoney(itemMoney);
-		return orderItemDo;
+		orderDo.setTotalMoney(orderDo.getTotalMoney() + orderItemDo.getMoney());
+		orderDo.setWeight(
+				BigDecimal.valueOf(orderDo.getWeight()).add(BigDecimal.valueOf(orderItemDo.getWeight())).doubleValue());
+		items.add(orderItemDo);
 	}
  
 	/**
-	 * 构建基本的订单详情数据   TODO need modify because of change
+	 * 构建基本的订单详情数据 TODO need modify because of change
 	 */
-	public static OrderQueryResponseDto buildOrderDetail(OrderDo order,
-			List<OrderItemDo> orderItem) {
+	public static OrderQueryResponseDto buildOrderDetail(OrderDo order, List<OrderItemDo> orderItem) {
 		OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
 		return orderQueryResponseDto;
 	}
-	
+
+	public List<OrderItemDo> getItems() {
+		return items;
+	}
+
+	public void setItems(List<OrderItemDo> items) {
+		this.items = items;
+	}
+
+	public OrderDo getOrderDo() {
+		return orderDo;
+	}
+
+	public void setOrderDo(OrderDo orderDo) {
+		this.orderDo = orderDo;
+	}
+
+	public AccountDto getSaccountDto() {
+		return saccountDto;
+	}
+
+	public void setSaccountDto(AccountDto saccountDto) {
+		this.saccountDto = saccountDto;
+	}
+
+	public OrderCreateRequestDto getOrderCreateDto() {
+		return orderCreateDto;
+	}
+
+	public void setOrderCreateDto(OrderCreateRequestDto orderCreateDto) {
+		this.orderCreateDto = orderCreateDto;
+	}
+
 }
@@ -12,6 +12,8 @@ import javax.validation.constraints.NotNull;
  */
 public class OrderCreateRequestDto {
  
+	private Long orderId;
+	
 	// 卖家账号
 	@NotNull(message = "卖家账号不能为空")
 	private Long saccount;
@@ -25,7 +27,7 @@ public class OrderCreateRequestDto {
 	// 总金额
 	private Long totalMoney;
  
-	// 订单来源
+	//订单来源
 	@NotNull(message = "订单创建来源不能为空")
 	private Integer createdSrc;
  
@@ -81,5 +83,13 @@ public class OrderCreateRequestDto {
 		this.createdSrc = createdSrc;
 	}
  
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
  
 }
@@ -57,7 +57,7 @@ public class OrderDo extends BaseDo{
 	private Long tradeNo;
  
 	//总金额
-	private Long totalMoney;
+	private Long totalMoney = 0L;
  
 	//卖家佣金
 	private Long scommission;
@@ -66,7 +66,7 @@ public class OrderDo extends BaseDo{
 	private Long bcommission;
  
 	//总重量
-	private Double weight;
+	private Double weight = 0.0D;
  
 	//订单类型
 	private Integer orderType;
@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
  
 import com.diligrp.xtrade.order.dao.OrderDao;
 import com.diligrp.xtrade.order.dao.OrderItemDao;
-import com.diligrp.xtrade.order.domain.builder.DefaultOrderBuilder;
+import com.diligrp.xtrade.order.domain.builder.DefaultOrderCreator;
 import com.diligrp.xtrade.order.domain.dto.AccountDto;
 import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
 import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
@@ -44,22 +44,21 @@ public class OrderServiceImpl implements OrderService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void createOrder(OrderCreateRequestDto orderCreateDto) {
-		Long orderId = getOrderKey();
+
 		AccountDto saccountDto = accountResolver.getAccount(orderCreateDto.getSaccount());
-		OrderDo order = DefaultOrderBuilder.initializeOrderBaseData(orderId, saccountDto,
-				orderCreateDto.getCreatedSrc());
-		Long totalMoney = 0L;
-		BigDecimal weight = BigDecimal.valueOf(0.0D);
-		List<OrderItemDo> orderItemDos = new ArrayList<OrderItemDo>();
-		for (OrderItemDto orderItem : orderCreateDto.getItems()) {
+
+		DefaultOrderCreator orderCreator = DefaultOrderCreator.builder(saccountDto, orderCreateDto, getOrderKey());
+
+		orderCreator.initializeOrderBaseData();
+
+		for (OrderItemDto orderItemDto : orderCreateDto.getItems()) {
 			// 订单详情数据封装
-			OrderItemDo orderItemDo = DefaultOrderBuilder.initializeItemData(getOrderItemKey(), orderId, orderItem);
-			totalMoney += orderItemDo.getMoney();
-			weight = weight.add(BigDecimal.valueOf(orderItemDo.getWeight()));
-			orderItemDos.add(orderItemDo);
+			orderCreator.initializeItemData(getOrderItemKey(), orderItemDto);
 		}
-		orderItemDao.insertBatch(orderItemDos);
-		orderDao.insertEntity(order);
+
+		orderItemDao.insertBatch(orderCreator.getItems());
+
+		orderDao.insertEntity(orderCreator.getOrderDo());
 	}
  
 	// TODO need modify because of change
@@ -80,7 +79,7 @@ public class OrderServiceImpl implements OrderService {
 	// TODO need modify because of change
 	@Override
 	public OrderQueryResponseDto orderDetail(Long orderId) {
-		OrderQueryResponseDto orderQueryResponseDto = DefaultOrderBuilder
+		OrderQueryResponseDto orderQueryResponseDto = DefaultOrderCreator
 				.buildOrderDetail(orderDao.selectEntityByOrderId(orderId), orderItemDao.selectItemsByOrderId(orderId));
 		return orderQueryResponseDto;
 	}
@@ -53,12 +53,7 @@
             <if test="description != null and description != ''">
                 `description` = #{description},
             </if>
-            <if test="createdTime != null">
-                created_time = #{createdTime},
-            </if>
-            <if test="modifiedTime != null">
-                modified_time = #{modifiedTime},
-            </if>
+            modified_time = now(),
         </set>
     </sql>
  
@@ -119,7 +114,7 @@
         insert into xt_merchant(mer_id, mer_name, market_id, account_id, account_name, type, status, description,
                                 created_time, modified_time)
         values (#{merId}, #{merName}, #{marketId}, #{accountId}, #{accountName}, #{type}, #{status}, #{description},
-                #{createdTime}, #{modifiedTime})
+                now(), now())
     </insert>
  
     <!--通过主键修改数据-->