[订单相关]

zhangxing
1 parent c5984e0d
Showing 6 changed files with 131 additions and 86 deletions
src/main/java/com/diligrp/xtrade/order/dao/OrderItemDao.java
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/entity/OrderDo.java
src/main/java/com/diligrp/xtrade/order/rpc/feign/AccountResolver.java
src/main/resources/mapping/com/diligrp/xtrade/order/OrderItemDao.xml
@@ -44,7 +44,7 @@ public interface OrderItemDao {
 	 * @return
 	 * @throws
 	 */
-	List<OrderItemDo> selectOrderItemByOrderId(@Param("orderId") Long orderId);
+	List<OrderItemDo> selectItemsByOrderId(@Param("orderId") Long orderId);
 	/**
 	 * 
+package com.diligrp.xtrade.order.domain.builder;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import com.diligrp.xtrade.order.domain.dto.AccountDto;
+import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
+import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
+import com.diligrp.xtrade.order.domain.emuns.OrderType;
+import com.diligrp.xtrade.order.domain.emuns.SaleUnit;
+import com.diligrp.xtrade.order.domain.emuns.TradeType;
+import com.diligrp.xtrade.order.domain.entity.OrderDo;
+import com.diligrp.xtrade.order.domain.entity.OrderItemDo;
+import com.diligrp.xtrade.order.exception.OrderException;
+
+/**
+ * @ClassName: DefaultOrderCreator
+ * @Description 订单实体相关模型
+ * @author zhangxing
+ * @date 2020年4月21日
+ */
+public class DefaultOrderBuilder {
+	
+	/**
+	 * 构建初始订单数据
+	 */
+	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 static OrderItemDo initializeOrderItemDoData(Long itemId, Long orderId, OrderItemDto orderItem){
+		OrderItemDo orderItemDo = new OrderItemDo();
+		orderItemDo.setItemId(itemId);
+		orderItemDo.setOrderId(orderId);
+		orderItemDo.setProductId(orderItem.getPid());
+		orderItemDo.setProductName(orderItem.getPname());
+		// 销售单价
+		BigDecimal price = BigDecimal.valueOf(orderItem.getPrice());
+		// 销售数量
+		BigDecimal amount = BigDecimal.valueOf(orderItem.getAmount());
+
+		orderItemDo.setAmount(orderItem.getAmount());
+
+		BigDecimal tempWeight = BigDecimal.valueOf(0.0D);
+
+		if (SaleUnit.KILO.getCode() == orderItem.getSaleUnit()) {
+			tempWeight = BigDecimal.valueOf(orderItem.getAmount());
+		} else if (SaleUnit.PIECE.getCode() == orderItem.getSaleUnit()) {
+			if (orderItem.getUnitWeight() == null || orderItem.getUnitWeight() < 0) {
+				throw new OrderException(String.format("%s件重非法", orderItem.getPname()));
+			}
+			BigDecimal dKiloPerItem = BigDecimal.valueOf(orderItem.getUnitWeight());
+			tempWeight = amount.multiply(dKiloPerItem);
+		}
+		orderItemDo.setWeight(tempWeight.doubleValue());
+		Long itemMoney = price.multiply(amount).setScale(0, RoundingMode.HALF_UP).longValue();
+		orderItemDo.setMoney(itemMoney);
+		return orderItemDo;
+	}
+
+	/**
+	 * 构建基本的订单详情数据
+	 */
+	public static OrderQueryResponseDto buildOrderDetail(OrderDo selectEntityByOrderId,
+			List<OrderItemDo> selectItemsByOrderId) {
+		OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
+		return orderQueryResponseDto;
+	}
+	
+}
-package com.diligrp.xtrade.order.domain.builder;
-
-import org.springframework.beans.BeanUtils;
-
-import com.diligrp.xtrade.order.domain.dto.AccountDto;
-import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
-import com.diligrp.xtrade.order.domain.entity.OrderDo;
-
-/**
- * @ClassName: DefaultOrderCreator
- * @Description 订单实体相关模型
- * @author zhangxing
- * @date 2020年4月21日
- */
-public class DefaultOrderCreator {
-	
-	//最终订单数据
-	private OrderDo order;
-	
-	//订单创建请求实体
-	private OrderCreateRequestDto orderCreateRequestDto;
-	
-	//卖家实体
-	private AccountDto saccountDto;
-	
-	//买家实体
-	private AccountDto baccountDto;
-	
-	//无参构造器
-	public DefaultOrderCreator(){
-		
-	}
-	
-	public DefaultOrderCreator(OrderCreateRequestDto orderCreateRequestDto, AccountDto saccountDto, AccountDto baccountDto){
-		this.orderCreateRequestDto = orderCreateRequestDto;
-		this.baccountDto = baccountDto;
-		this.saccountDto = saccountDto;
-	}
-	
-	/**
-	 * 初始化订单数据用于后面的校验
-	 */
-	public void initialize() {
-		
-	}
-	
-	public OrderDo getOrder() {
-		return order;
-	}
-
-	public void setOrder(OrderDo order) {
-		this.order = order;
-	}
-
-	public OrderCreateRequestDto getOrderCreateRequestDto() {
-		return orderCreateRequestDto;
-	}
-
-	public void setOrderCreateRequestDto(OrderCreateRequestDto orderCreateRequestDto) {
-		this.orderCreateRequestDto = orderCreateRequestDto;
-	}
-
-	public AccountDto getSaccountDto() {
-		return saccountDto;
-	}
-
-	public void setSaccountDto(AccountDto saccountDto) {
-		this.saccountDto = saccountDto;
-	}
-
-	public AccountDto getBaccountDto() {
-		return baccountDto;
-	}
-
-	public void setBaccountDto(AccountDto baccountDto) {
-		this.baccountDto = baccountDto;
-	}
-	
-	public static OrderDo build(OrderCreateRequestDto orderCreateRequestDto) {
-		OrderDo orderDo = new OrderDo();
-		BeanUtils.copyProperties(orderCreateRequestDto, orderDo);
-		return orderDo;
-	}
-}
@@ -70,6 +70,9 @@ public class OrderDo extends BaseDo{
 	//订单类型
 	private Integer orderType;
+	
+	//订单类型
+	private Integer tradeType;
 	//支付方式
 	private Integer payType;
@@ -263,6 +266,14 @@ public class OrderDo extends BaseDo{
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
 	}
+
+	public Integer getTradeType() {
+		return tradeType;
+	}
+
+	public void setTradeType(Integer tradeType) {
+		this.tradeType = tradeType;
+	}
 }
+package com.diligrp.xtrade.order.rpc.feign;
+
+import javax.annotation.Resource;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+import com.diligrp.xtrade.order.domain.dto.AccountDto;
+import com.diligrp.xtrade.order.exception.OrderException;
+import com.diligrp.xtrade.shared.domain.Message;
+
+/**
+ * @ClassName: AccountResolver
+ * @Description 远程卡务调用解析
+ * @author zhangxing
+ * @date 2020年4月22日
+ */
+@Component
+public class AccountResolver {
+
+	@Resource
+	private AccountRPC accountRPC;
+
+	/**
+	 * 根据id获取账户信息
+	 */
+	public AccountDto getAccount(Long accountId) {
+		Message<AccountDto> message = accountRPC.getDltAccount(accountId);
+		if (!HttpStatus.OK.equals(message.getCode())) {
+			throw new OrderException(message.getMessage());
+		}
+		return message.getData();
+	}
+}
@@ -13,7 +13,7 @@
 							VALUES (#{itemId}, #{orderId}, #{productName}, #{productId}, #{price}, #{amount}, #{saleUnit}, #{unitWeight}, #{scommission}, #{bcommission}, #{ruleid}, #{ruleRate}, #{}weight, #{totalMoney}, NOW(), NOW());
 	</insert>
- 	<select id="selectOrderItemByItemId" parameterType="long" resultType="orderItemDo">
+ 	<select id="selectItemsByOrderId" parameterType="long" resultType="orderItemDo">
  		SELECT 
 		<include refid="QUERY_COLUMN_LIST"/>
 		FROM `xt_order_item`