Merge branch 'master' into 3.7

# Conflicts:
#	src/main/java/com/gogirl/domain/order/mall/MallOrder.java

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

@@ -10,18 +10,17 @@ 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.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;
@@ -52,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) {
@@ -177,23 +177,25 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
                 .collect(Collectors.toList()));
 
         mallOrder.setCustomerId(cmd.getCustomerId());
-
+        mallOrder.setSelfTakePhone(cmd.getPhone());
         //订单状态
         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())) {
+                Customer customer = customerMapper.selectById(mallOrder.getCustomerId());
+                mallOrder.setSelfTakePhone(customer.getPhone());
+            }
         }
 
         mallOrder.setTotalPayAmount(mallOrder.getTotalAmount().add(mallOrder.getFreight()));
@@ -275,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/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -1117,7 +1117,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     @Override
     public IPage<LeisureScheduleServeResp> queryPageLeisureScheduleServe(LeisureScheduleServeQuery query) {
         if (query.getLongitude() == null || query.getLongitude() == 0) {
-            query.setLatitude(113.37538146972656);
+            query.setLongitude(113.37538146972656);
         }
         if (query.getLatitude() == null || query.getLatitude() == 0) {
             query.setLatitude(23.14084243774414);

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

@@ -79,6 +79,7 @@ public class MallOrder {
     private Integer paymentCustomerId;
 
     @ApiModelProperty("订单类型")
+    @ApiModelProperty("订单类型 1-默认类型")
     private Integer type;
 
     @ApiModelProperty("订单状态 1-订单待付款 2-订单已付款 3-订单已发货 4-订单已签收 5-交易关闭 6-订单退款中")
@@ -116,6 +117,8 @@ public class MallOrder {
     @ApiModelProperty("状态机备注")
     private String remark;
 
+
+    @TableField(exist = false)
     @ApiModelProperty(value = "配送地址id", required = true)
     private Long mallOrderAddressId;
 

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -280,7 +280,7 @@ public class Schedule {
     public void cancelPassMallOrder() {
 
         log.debug("定时检查有无过期的商城订单** 任务开始");
-        Date passDate = new Date(new Date().getTime() - new Long("1800000"));
+        Long passDate = new Date().getTime() - new Long("1800000");
 
         List<MallOrder> mallOrderList = mallOrderMapper.selectList(new LambdaQueryWrapper<MallOrder>()
                 .lt(MallOrder::getCreateTime, passDate)

src/main/java/com/gogirl/interfaces/order/mall/MallOrderController.java

@@ -33,7 +33,6 @@ public class MallOrderController {
     public JsonResult<MallOrder> submitMallOrder(@RequestHeader String token,
                                                  @RequestBody SubmitMallOrderCommand cmd) {
 
-        log.info("token：{}", token);
         log.info("token:{}", SessionUtils.getCustomerToken().toString());
         Integer currentCustomerId = SessionUtils.getCustomerId();
         cmd.setCustomerId(currentCustomerId);

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;