修改bug

Pu Zhibing

1 天以前 10605ab6dd65845b7adf52ab319a4087813e6808

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

@@ -68,6 +68,9 @@

    @Resource
    private UserActivityDiscount1Mapper userActivityDiscount1Mapper;
    
    @Resource
    private UserActivityDiscount2Mapper userActivityDiscount2Mapper;

    @Resource
    private SysIntegralMapper sysIntegralMapper;
@@ -302,9 +305,9 @@
        }

        //计算折扣
        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderCrossCity.getCompanyId());
        UserActivityDiscount2 query2 = userActivityDiscount2Mapper.query(orderCrossCity.getLineId());
        if(null != query2){
            Double special = query2.getSpecial();
            Double special = query2.getDiscount();
            orderCrossCity.setDiscount(special);
            double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            if(orderMoney.compareTo(v) > 0){
@@ -587,9 +590,9 @@
        orderCrossCity.setRemark(orderCrossCityWarpper.getRemark());
        orderCrossCity.setIsReassign(1);
        //调用高德创建轨迹
        String s = gdFalconUtil.selectTerminal(driver.getPhone());
        String track = gdFalconUtil.createTrack(s);
        orderCrossCity.setTrackId(track);
//        String s = gdFalconUtil.selectTerminal(driver.getPhone());
//        String track = gdFalconUtil.createTrack(s);
//        orderCrossCity.setTrackId(track);
        if(orderCrossCity.getTravelMode() == 2){//包车
            orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
            orderCrossCity.setPeopleNumber(lineShiftDriver.getLaveSeat());