新增加司机端接口

puzhibing

2023-02-24 1f0899504f54bae20c19122b4fde82523235233b

新增加司机端接口

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/OrderMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -17,4 +18,12 @@
     * @return
     */
    List<HallOrderList> queryOrderHall(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);


    /**
     * 获取订单详情
     * @param orderId
     * @return
     */
    OrderInfoWarpper queryOrderInfo(@Param("orderId") Long orderId);
}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml

@@ -80,4 +80,31 @@
        left join t_app_user b on (a.userId = b.id)
        where a.`status` = 1 and a.hallOrder = 1 order by a.createTime desc
    </select>



    <select id="queryOrderInfo" resultType="com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper">
        select
        a.id,
        b.avatar,
        a.userName,
        a.userPhone,
        (select count(1) from t_order where userPhone = a.userPhone and state in (107, 108)) as orderTimes,
        (select count(1) from t_order where userPhone = a.userPhone and state in (301)) as cancelTimes,
        a.source,
        UNIX_TIMESTAMP(a.createTime) * 1000 as createTime,
        a.startAddress,
        a.startLat,
        a.startLng,
        a.endAddress,
        a.endLat,
        a.endLng,
        a.estimatedPrice,
        a.estimatedMileage,
        a.startPrice,
        a.state
        from t_order a
        left join t_app_user b on (a.userId = b.id)
        where a.id = #{orderId}
    </select>
</mapper>

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java

@@ -6,6 +6,7 @@
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.BaseWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;

import java.util.List;

@@ -69,6 +70,11 @@
    ResultUtil receiveOrder(Integer uid, Long orderId) throws Exception;



    queryOrderInfo(Long orderId) throws Exception;
    /**
     * 获取订单详情
     * @param orderId
     * @return
     * @throws Exception
     */
    OrderInfoWarpper queryOrderInfo(Long orderId) throws Exception;
}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -15,6 +15,7 @@
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.geo.Circle;
import org.springframework.data.geo.Distance;
@@ -103,13 +104,15 @@
         * 司机上线且空闲，下单直接给当前司机，其余进大厅
         * 司机下的订单不需要创建新用户，且只能走线下支付
         */

        int count = this.selectCount(new EntityWrapper<Order>().eq("userPhone", addOrderWarpper.getPhone()).eq("status", 1).in("state", Arrays.asList(101, 102, 103, 104, 105, 106, 201)));
        if(count > 0){
            return ResultUtil.error("该用户还有未完成的订单");
        }
        Driver driver = driverService.selectById(uid);
        DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", uid).eq("status", 1));
        if(null == driverWork){
            return ResultUtil.error("请先上班");
        }
        Order order1 = this.selectOne(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201)));
        Order order = new Order();
        if(driverWork != null && null == order1){
@@ -572,4 +575,10 @@
        }
        return ResultUtil.success();
    }


    @Override
    public OrderInfoWarpper queryOrderInfo(Long orderId) throws Exception {
        return null;
    }
}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/HallOrderList.java

@@ -42,8 +42,6 @@
    private String endLat;
    @ApiModelProperty("终点经度")
    private String endLng;
    @ApiModelProperty("预估费")
    private Double estimatedPrice;
    @ApiModelProperty("预估里程")
    private Double estimatedMileage;
    @ApiModelProperty("起步价")

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java

@@ -37,8 +37,6 @@
    private String endLat;
    @ApiModelProperty("终点经度")
    private String endLng;
    @ApiModelProperty("预估费")
    private Double estimatedPrice;
    @ApiModelProperty("预估里程")
    private Double estimatedMileage;
    @ApiModelProperty("起步价")