update

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

@@ -12,16 +12,13 @@ import com.gogirl.domain.order.mall.*;
 import com.gogirl.domain.product.mall.MallProduct;
 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.shared.market.SubmitMallOrderCommand;
 import com.gogirl.shared.member.ImmediatePurchaseCommand;
-import com.gogirl.shared.order.CancelMallOrderCommand;
-import com.gogirl.shared.order.MallOrderDTO;
-import com.gogirl.shared.order.MallOrderDetailDTO;
-import com.gogirl.shared.order.SettleMallOrderItemQuery;
-import com.gogirl.shared.order.SettleMallOrderQuery;
+import com.gogirl.shared.order.*;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -180,20 +177,21 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
 
         //订单状态
         mallOrder.setStatus(MallOrder.STATUS_UN_PAY);
-
         //时间
         mallOrder.setCreateTime(System.currentTimeMillis());
         //下单时间
         mallOrder.setOrderTime(System.currentTimeMillis());
-
         //交易方式 线上交易
         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));
+            //运输设置运费
+            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())) {
+                throw new RRException("请输入正确的手机号码");
+            }
         }
 
         mallOrder.setTotalPayAmount(mallOrder.getTotalAmount().add(mallOrder.getFreight()));

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

@@ -54,8 +54,10 @@ public class MallOrder {
     private BigDecimal totalDiscountAmount;
     @ApiModelProperty("实际支付总金额")
     private BigDecimal totalPayAmount;
+
     @ApiModelProperty("配送方式 1-邮寄 2-自取")
     private Integer transportMode;
+
     @ApiModelProperty("支付方式 1-微信支付 2-余额支付 3-余额抵扣微信支付")
     private Integer paymentType;