商城订单

src/main/java/com/gogirl/application/order/mall/impl/MallOrderServiceImpl.java

@@ -10,12 +10,14 @@ import com.gogirl.application.order.mall.MallOrderService;
 import com.gogirl.application.order.mall.MallShoppingCartService;
 import com.gogirl.domain.order.mall.*;
 import com.gogirl.domain.product.mall.MallProduct;
+import com.gogirl.domain.user.customer.Customer;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.SpringBeanUtils;
 import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderAddressMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
 import com.gogirl.infrastructure.mapper.product.mall.MallProductMapper;
+import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
 import com.gogirl.shared.market.SubmitMallOrderCommand;
 import com.gogirl.shared.member.ImmediatePurchaseCommand;
 import com.gogirl.shared.order.*;
@@ -49,6 +51,7 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
     private final MallShoppingCartService mallShoppingCartService;
     private final MallCustomerAddressService mallCustomerAddressService;
     private final MallProductMapper mallProductMapper;
+    private final CustomerMapper customerMapper;
 
     @Override
     public MallOrder saveAggregate(MallOrder mallOrder) {
@@ -174,7 +177,7 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
                 .collect(Collectors.toList()));
 
         mallOrder.setCustomerId(cmd.getCustomerId());
-
+        mallOrder.setSelfTakePhone(cmd.getPhone());
         //订单状态
         mallOrder.setStatus(MallOrder.STATUS_UN_PAY);
         //时间
@@ -190,7 +193,8 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         } else {
             mallOrder.setFreight(BigDecimal.ZERO);
             if (!StringUtils.isPhone(mallOrder.getSelfTakePhone())) {
-                throw new RRException("请输入正确的手机号码");
+                Customer customer = customerMapper.selectById(mallOrder.getCustomerId());
+                mallOrder.setSelfTakePhone(customer.getPhone());
             }
         }
 
@@ -273,6 +277,17 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         //交易方式 线上交易
         mallOrder.setTransactionType(MallOrder.TRANSACTION_TYPE_ONLINE);
 
+        if (mallOrder.getTransportMode().equals(1)) {
+            //运输设置运费
+            mallOrder.setFreight(mallOrder.getTotalAmount().compareTo(new BigDecimal(100)) > 0 ? new BigDecimal("0.00") : new BigDecimal("6.00"));
+        } else {
+            mallOrder.setFreight(BigDecimal.ZERO);
+            if (!StringUtils.isPhone(mallOrder.getSelfTakePhone())) {
+                Customer customer = customerMapper.selectById(mallOrder.getCustomerId());
+                mallOrder.setSelfTakePhone(customer.getPhone());
+            }
+        }
+
         //收货地址
         MallCustomerAddress mallCustomerAddress = mallCustomerAddressService.getById(cmd.getMallCustomerAddressId());
         MallOrderAddress mallOrderAddress = new MallOrderAddress();

src/main/java/com/gogirl/domain/order/mall/MallOrder.java

@@ -48,6 +48,7 @@ public class MallOrder {
     private Long paymentTime;
     @ApiModelProperty("订单总金额")
     private BigDecimal totalAmount;
+
     @ApiModelProperty("运费")
     private BigDecimal freight;
     @ApiModelProperty("总优惠金额")
@@ -67,7 +68,7 @@ public class MallOrder {
 
     @ApiModelProperty("付款客户")
     private Integer paymentCustomerId;
-    @ApiModelProperty("订单类型")
+    @ApiModelProperty("订单类型 1-默认类型")
     private Integer type;
     @ApiModelProperty("订单状态 1-订单待付款 2-订单已付款 3-订单已发货 4-订单已签收 5-交易关闭 6-订单退款中")
     private Integer status;
@@ -85,14 +86,19 @@ public class MallOrder {
     @Version
     private Long version;
     private Long createTime;
+
     @ApiModelProperty("订单收货地址")
     @TableField(exist = false)
     private MallOrderAddress mallOrderAddress;
+
     @TableField(exist = false)
     @ApiModelProperty("订单详情")
     private List<MallOrderDetail> mallOrderDetailList;
+
     @ApiModelProperty("状态机备注")
     private String remark;
+
+    @TableField(exist = false)
     @ApiModelProperty(value = "配送地址id", required = true)
     private Long mallOrderAddressId;
 

src/main/java/com/gogirl/shared/market/SubmitMallOrderCommand.java

@@ -33,8 +33,12 @@ public class SubmitMallOrderCommand {
     @ApiModelProperty("自提店铺id")
     private Integer selfTakeDepartmentId;
 
+//    @ApiModelProperty("自提客户手机号")
+//    private String selfTakePhone;
+
     @ApiModelProperty("自提客户手机号")
-    private String selfTakePhone;
+    @Deprecated
+    private String phone;
 
     @ApiModelProperty("自提店铺地址")
     private String selfTakeDepartmentAddress;