跨城修改

xuhy

2 天以前 3814e08bda76c5654ddcdc4778724b69dda26211

跨城修改

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -52,6 +52,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;

import static com.stylefeng.guns.modular.taxi.service.impl.OrderTaxiServiceImpl.orderIds;
@@ -589,7 +590,8 @@
        orderCrossCity.setSort(orderCrossCities.size() + 1);
        orderCrossCity.setState(7);//待支付
        orderCrossCity.setInsertTime(new Date());
        orderCrossCity.setTravelTime(orderCrossCityWarpper.getTravelTime());
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        orderCrossCity.setTravelTime(format.parse(orderCrossCityWarpper.getTravelTime()));
        orderCrossCity.setSnatchOrderTime(new Date());
        orderCrossCity.setTravelMode(orderCrossCityWarpper.getTravelMode());
        orderCrossCity.setOrderSource(orderCrossCityWarpper.getOrderSource());

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java

@@ -37,7 +37,7 @@
    @ApiModelProperty(value = "终点详细地址", required = true, dataType = "string")
    private String endAddress;
    @ApiModelProperty(value = "出行时间(2020-09-04 12:00:00)", required = true, dataType = "string")
    private Date travelTime;
    private String travelTime;
    @ApiModelProperty(value = "出行方式（1=拼车，2=包车）", required = true, dataType = "int")
    private Integer travelMode;
    @ApiModelProperty(value = "订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单)", required = true, dataType = "int")
@@ -167,11 +167,11 @@
        this.endAddress = endAddress;
    }

    public Date getTravelTime() {
    public String getTravelTime() {
        return travelTime;
    }

    public void setTravelTime(Date travelTime) {
    public void setTravelTime(String travelTime) {
        this.travelTime = travelTime;
    }