Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

2025-08-05 415017b0673c08818997189b44af8f1d04a55078

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

# Conflicts:
#	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java

@@ -51,7 +51,7 @@
                                             @Param("state") Integer state,
                                             @Param("lon") String lon,
                                             @Param("lat") String lat);
    Map<String, Object> queryOrderInfo2(@Param("orderId") Integer orderId);
    Map<String, Object> queryOrderInfo2(@Param("orderId") Integer orderId, @Param("openCityId") Integer openCityId);




 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -340,7 +340,7 @@
        c.remark as cancelRemark,
        c.money as cancelPayMoney,
        if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
        (select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign
        (select isSpecialCar from t_sys_reformist where openCityId = #{openCityId}) as reassign
        from t_order_private_car a
        left join t_user b on (a.userId = b.id)
        left join t_order_cancel c on (a.id = c.orderId and c.orderType = 1 and c.state = 2)

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -107,8 +107,11 @@
    
    @Resource
    private RedisTemplate<String, Object> redisTemplate;
    @Autowired
    private OpenCityServiceImpl openCityServiceImpl;



    @Resource
    private IOpenCityService openCityService;


    /**
@@ -475,7 +478,9 @@
        map.put("emergencyCall",  "110");
        map.put("orders", JSON.toJSONString(orders));
        return map;*/
        Map<String,Object> map = orderPrivateCarMapper.queryOrderInfo2(orderId);
        OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderId);
        OpenCity openCity = openCityService.openCity1(orderPrivateCar1.getStartLon().toString(), orderPrivateCar1.getStartLat().toString());
        Map<String,Object> map = orderPrivateCarMapper.queryOrderInfo2(orderId, openCity.getId());
        OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
        Integer canOperation=1;
        if(orderPrivateCar.getState()<5){

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/OrderTaxiMapper.java

@@ -52,7 +52,7 @@
     * @param orderId
     * @return
     */
    Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId);
    Map<String, Object> queryOrderInfo(@Param("orderId") Integer orderId, @Param("openCityId") Integer openCityId);


    /**

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -295,7 +295,7 @@
        c.remark as cancelRemark,
        c.money as cancelPayMoney,
        if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
        (select isTaxiCar from t_sys_reformist where companyId = a.companyId) as reassign
        (select isTaxiCar from t_sys_reformist where openCityId = #{openCityId}) as reassign
        from t_order_taxi a
        left join t_user b on (a.userId = b.id)
        left join t_order_cancel c on (a.id = c.orderId and c.orderType = 2 and c.state = 2)

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -76,6 +76,9 @@
    @Autowired
    private TDriverPromotionActivityService driverPromotionActivityService;

    @Resource
    private IOpenCityService openCityService;




@@ -473,7 +476,9 @@
     */
    @Override
    public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
        return orderTaxiMapper.queryOrderInfo(orderId);
        OrderTaxi orderTaxi = this.selectById(orderId);
        OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
        return orderTaxiMapper.queryOrderInfo(orderId, openCity.getId());
    }