修改bug

zhibing.pu

2024-09-02 e450b6ffb2b6cea8cca12b21d0003fb66fde7b36

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -23,6 +23,8 @@
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -47,6 +49,8 @@
@Controller
@RequestMapping("/tOrderPrivateCar")
public class TOrderPrivateCarController extends BaseController {
    
    Logger log = LoggerFactory.getLogger(this.getClass());

    private String PREFIX = "/system/tOrderPrivateCar/";

@@ -206,7 +210,7 @@
        orderPrivateCar.setOrderMoney(money);
        orderPrivateCar.setPayMoney(money);
        orderPrivateCar.setState(7);
        orderPrivateCar.setIsDispute(3);
        orderPrivateCar.setIsDispute(1);
        orderPrivateCar.updateById();
        return SUCCESS_TIP;
    }
@@ -217,115 +221,74 @@
    public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception {
        TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);

        //添加已收入明细
        TDriver tDriver = driverService.selectById(orderPrivateCar.getDriverId());
        orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用

        //添加已收入明细
        TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
        Double taxi = company.getSpeMoney().doubleValue();
        Integer language =tDriver.getLanguage();
        BigDecimal d = null;//企业收入
        BigDecimal c = null;//司机收入
        if(company.getIsSpeFixedOrProportional() == 2){//固定
            d = new BigDecimal(taxi);
            c = orderPrivateCar.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
        }
        if(company.getIsSpeFixedOrProportional() == 1){//比例
            Double price = orderPrivateCar.getStartMoney().doubleValue() + orderPrivateCar.getMileageMoney().doubleValue() + orderPrivateCar.getWaitMoney().doubleValue()+ orderPrivateCar.getDurationMoney().doubleValue() + orderPrivateCar.getLongDistanceMoney().doubleValue();
            d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
            c = orderPrivateCar.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
        }
        if(orderPrivateCar.getIsFrozen()==1){
            TDriver driver = driverService.selectById(orderPrivateCar.getDriverId());
            driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).subtract(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
            driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).subtract(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
            driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).subtract(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
            driver.setFrozenMoney(driver.getFrozenMoney().add(c));
            driverService.updateById(driver);
        }else{
            TDriver driver = driverService.selectById(orderPrivateCar.getDriverId());
            driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
            driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
            driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
            driver.setFrozenMoney(driver.getFrozenMoney().subtract(c));
            driverService.updateById(driver);
        }
        if (orderPrivateCar.getIsFrozen() == 1){
            TOrderPrivateCar orderPrivateCar1 = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
            if(orderPrivateCar1.getArriveTime()==null){
                orderPrivateCar1.setArriveTime(orderPrivateCar1.getStartServiceTime());
        if(orderPrivateCar.getIsFrozen() == 1 && orderPrivateCar.getState() < 7){
            if(orderPrivateCar.getArriveTime()==null){
                orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
            }
            orderPrivateCar1 = this.setMoney(orderPrivateCar1, 0D, 0D);//计算费用

            orderPrivateCar1.setOrderMoney(orderPrivateCar1.getOrderMoney().add(orderPrivateCar1.getParkMoney()).add(orderPrivateCar1.getRoadTollMoney()));
            orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
            orderPrivateCar.setPayManner(1);
            orderPrivateCar.setParkMoney(new BigDecimal(0));
            orderPrivateCar.setRoadTollMoney(new BigDecimal(0));
            //判断是否首单免费-免费直接完成
            Integer orderNumber = tOrderPrivateCarService.selectCount(new EntityWrapper<TOrderPrivateCar>().eq("userId",orderPrivateCar1.getUserId()).last("and (state=8 or state=9)"));

            Integer orderNumber = tOrderPrivateCarService.selectCount(new EntityWrapper<TOrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).last("and (state=8 or state=9)"));
    
            if(orderNumber<=0){//判断是否是首单
                //判断是否免单
                TUser userInfo = userService.selectById(orderPrivateCar1.getUserId());
                TUser userInfo = userService.selectById(orderPrivateCar.getUserId());
                if(userInfo.getFreeMoney().doubleValue()>0d){
                    if(orderPrivateCar1.getOrderMoney().compareTo(userInfo.getFreeMoney())<=-1){
                        orderPrivateCar1.setState(8);
                        orderPrivateCar1.setIsFree(2);
                    if(orderPrivateCar.getOrderMoney().compareTo(userInfo.getFreeMoney())<=0){
                        orderPrivateCar.setState(8);
                        orderPrivateCar.setIsFree(2);
                        //添加已收入明细
                        TCompany tCompany = companyService.selectById(orderPrivateCar1.getCompanyId());
                        BigDecimal speMoney = tCompany.getSpeMoney();

                        if(tCompany.getIsSpeFixedOrProportional() == 2){//固定
                            d = speMoney;
                            c = orderPrivateCar1.getOrderMoney().subtract(d);//只有出行金额参与抽成，其余归属司机
                        TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
                        Double speMoney = company.getSpeMoney().doubleValue();
                        BigDecimal d = null;//企业收入
                        BigDecimal c = null;//司机收入
                        if(company.getIsSpeFixedOrProportional() == 2){//固定
                            d = new BigDecimal(speMoney);
                            c = orderPrivateCar.getOrderMoney().subtract(d);//只有出行金额参与抽成，其余归属司机
                        }
                        if(tCompany.getIsSpeFixedOrProportional() == 1){//比例
                            BigDecimal price = orderPrivateCar1.getStartMoney().add(orderPrivateCar1.getMileageMoney()).add(new BigDecimal(orderPrivateCar1.getWaitMoney())).add(orderPrivateCar1.getDurationMoney()).add(orderPrivateCar1.getLongDistanceMoney());
                            d = price.multiply(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN));
                            c = orderPrivateCar1.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                        if(company.getIsSpeFixedOrProportional() == 1){//比例
                            Double price = orderPrivateCar.getStartMoney().add(orderPrivateCar.getMileageMoney()).add(new BigDecimal(orderPrivateCar.getWaitMoney())).add(orderPrivateCar.getDurationMoney()).add(orderPrivateCar.getLongDistanceMoney()).doubleValue();
                            d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
                            c = orderPrivateCar.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
                        }
                        incomeService.saveData(1, orderPrivateCar1.getCompanyId(), 2, orderPrivateCar1.getId(), 1, d.doubleValue());
                        incomeService.saveData(2, orderPrivateCar1.getDriverId(), 2, orderPrivateCar1.getId(), 1, c.doubleValue());
                        TDriver driver = driverService.selectById(orderPrivateCar1.getDriverId());
                        incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
                        incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());
                        TDriver driver = driverService.selectById(orderPrivateCar.getDriverId());
                        driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                        driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                        if (null != driver.getBalance()){
                            driver.setBalance(driver.getBalance().add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                        }else{
                            driver.setBalance(BigDecimal.ZERO.add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                        }
                        driver.setBalance((null != driver.getBalance() ? driver.getBalance() : new BigDecimal("0")).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
                        driverService.updateById(driver);
                    }else{
                        orderPrivateCar1.setState(7);
                        orderPrivateCar1.setOrderMoney(orderPrivateCar1.getOrderMoney().subtract(userInfo.getFreeMoney()));
                        orderPrivateCar1.setFreeMoney(userInfo.getFreeMoney());

                        orderPrivateCar.setState(7);
                        orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney().subtract(userInfo.getFreeMoney()));
                        orderPrivateCar.setFreeMoney(userInfo.getFreeMoney());
                
                    }

            
                }else{
                    orderPrivateCar1.setState(7);
                    orderPrivateCar.setState(7);
                }

        
            }else{
                orderPrivateCar1.setState(7);
                orderPrivateCar.setState(7);
            }

//            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar1.getBindId(),orderPrivateCar1.getTelX());
//            if(String.valueOf(map.get("code")).equals("200")){
//                orderPrivateCar1.setTelX("");
//                orderPrivateCar1.setBindId("");
//            }
            tOrderPrivateCarService.updateById(orderPrivateCar1);


            pushUtil.removeTask(orderPrivateCar1.getId(), 1);//删除定时任务，结束推送数据
            systemNoticeService.addSystemNotice(1, language == 1 ? "司机已结束本次行程，谢谢使用" : language == 2 ?
                    "The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderPrivateCar1.getUserId());

            
            tOrderPrivateCarService.updateById(orderPrivateCar);
    
    
            TUser userInfo = userService.selectById(orderPrivateCar.getUserId());
            Integer language1 = userInfo.getLanguage();
            systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已结束本次行程，谢谢使用" : language1 == 2 ?
                    "The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderPrivateCar.getUserId());
    
            //回滚司机状态为空闲
            TDriver driver = driverService.selectById(orderPrivateCar1.getDriverId());
            TDriver driver = driverService.selectById(orderPrivateCar.getDriverId());
            driver.setState(2);
            driverService.updateById(driver);

            TOrderPrivateCar finalOrderTaxi = orderPrivateCar1;
    
            TOrderPrivateCar finalOrderTaxi = orderPrivateCar;
            new Thread(new Runnable() {
                @Override
                public void run() {
@@ -333,30 +296,25 @@
                    pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState(), 0, "");
                }
            }).start();

            TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar1;
    
            TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
            new Thread(()->{
                try {
                    //上报google
                    fleetEngineUtil.reportBillableEvent(finalOrderPrivateCar.getTripId());
                    System.err.println("上报时间：{}，tripid：{}，created_at：{}，completed_at：{}"+ System.currentTimeMillis()+ finalOrderPrivateCar.getTripId()+
                            finalOrderPrivateCar.getInsertTime().getTime()+finalOrderPrivateCar.getEndServiceTime().getTime());
                    log.warn("上报时间：{}，tripid：{}，created_at：{}，completed_at：{}", System.currentTimeMillis(), finalOrderPrivateCar.getTripId(),
                            finalOrderPrivateCar.getInsertTime().getTime(), finalOrderPrivateCar.getEndServiceTime().getTime());
                }catch (Exception e){
                    e.printStackTrace();
                }
            }).start();
            // 冻结订单需要给司机推送一个消息;
            new Thread(new Runnable() {
                @Override
                public void run() {
                    pushUtil.frozenOrder(finalOrderPrivateCar.getDriverId(),2);
                    pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, "");
                }
            }).start();
    
            pushUtil.frozenOrder(orderPrivateCar.getDriverId(), 2);
        }
        
        orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
        tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);

        orderPrivateCar.setIsDispute(1);
        tOrderPrivateCarService.updateById(orderPrivateCar);
        return SUCCESS_TIP;
    }
    @Autowired
@@ -645,8 +603,8 @@
        OrderCancel orderCancel = new OrderCancel();
        orderCancel.setOrderId(tOrderPrivateCarId);
        orderCancel.setOrderType(1);
        orderCancel.setReason(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande");
        orderCancel.setRemark(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande");
        orderCancel.setReason("The platform cancelled the order");
        orderCancel.setRemark("The platform cancelled the order");
        orderCancel.setUserType(2);
        orderCancel.setState(2);
        orderCancel.setInsertTime(new Date());