修改2.0 bug

zhibing.pu

2024-08-01 3e39fd833920dc78e2b8ece3b4f3b2ac2705b9c1

修改2.0 bug

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java

@@ -158,9 +158,11 @@
                String order_id = payments.getPayer_transaction_id();
                if(ToolUtil.isNotEmpty(out_trade_no)){
                    Integer language = Integer.valueOf(out_trade_no.substring(17, 18));
                    Integer id = Integer.valueOf(out_trade_no.substring(18));
                    Integer payType = Integer.valueOf(out_trade_no.substring(18, 19));
                    Integer id = Integer.valueOf(out_trade_no.substring(19));

                    SettlementRecord settlementRecord = settlementRecordService.selectById(id);
                    settlementRecord.setPayType(payType);
                    settlementRecord.setPaymentStatus(2);
                    settlementRecord.setPayTime(new Date());
                    settlementRecord.setCode(order_id);

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java

@@ -49,7 +49,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, Integer language) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, Integer language, Integer uid) throws Exception;


    /**

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -350,8 +350,11 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, Integer language) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String pickUpCode, Integer language, Integer uid) throws Exception {
        OrderLogistics orderLogistics = this.selectById(orderId);
        if(!uid.equals(orderLogistics.getDriverId())){
            return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
        }
        if(orderLogistics.getState().compareTo(state) == 0){
            return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
        }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java

@@ -74,7 +74,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language, Integer uid) throws Exception;


    /**

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

@@ -470,8 +470,11 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language, Integer uid) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
        if(!uid.equals(orderPrivateCar.getDriverId())){
            return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
        }
        if(orderPrivateCar.getState().compareTo(state) == 0){
            return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
        }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml

@@ -39,7 +39,7 @@
        carryOut as carryOut,
        money as money,
        insertTime as insertTime
        from t_driver_activity_history where `day` between #{start} and #{end}
        from t_driver_activity_history where `day` between #{start} and #{end} and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)
        <if test="null != type">
            and `type` = #{type}
        </if>

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOnlineMapper.xml

@@ -21,7 +21,8 @@
        a.id as id,
        a.type as type,
        a.online as online,
        a.money as money
        a.money as money,
        a.driverActivityId
        from t_driver_activity_online a
        left join t_driver_activity b on (a.driverActivityId = b.id)
        where (now() between b.startTime and b.endTime) and a.companyId = #{companyId} and b.status = 3

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOrderMapper.xml

@@ -23,7 +23,8 @@
        a.money as money,
        a.orderNum as orderNum,
        a.start as start,
        a.`end` as `end`
        a.`end` as `end`,
        a.driverActivityId
        from t_driver_activity_order a
        left join t_driver_activity b on (a.driverActivityId = b.id)
        where a.companyId = #{companyId} and (now() between a.startTime and a.endTime)  and b.status = 3

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityRegisteredMapper.xml

@@ -20,7 +20,8 @@
        select
        a.id as id,
        CONCAT('邀请', if(a.`type` = 1, '司机', '用户'), '注册奖励GHS', a.money) as content,
        a.money as money
        a.money as money,
        a.driverActivityId
        from t_driver_activity_registered a
        left join t_driver_activity b on (a.driverActivityId = b.id)
        where now() between a.startTime and a.endTime and a.companyId = #{companyId} and a.`type` = #{type} and b.status = 3

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java

@@ -34,6 +34,11 @@
    @TableField("type")
    private Integer type;
    /**
     * 司机活动id
     */
    @TableField("driverActivityId")
    private Integer driverActivityId;
    /**
     * 活动id
     */
    @TableField("activityId")
@@ -85,7 +90,15 @@
    public void setType(Integer type) {
        this.type = type;
    }

    
    public Integer getDriverActivityId() {
        return driverActivityId;
    }
    
    public void setDriverActivityId(Integer driverActivityId) {
        this.driverActivityId = driverActivityId;
    }
    
    public Integer getActivityId() {
        return activityId;
    }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java

@@ -156,7 +156,7 @@
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.selectList(new EntityWrapper<DriverActivityHistory>().eq("driverId", driverId)
                .eq("type", 3).eq("carryOut", 1).last(" and day = '" + sdf.format(new Date()) + "'"));
                .eq("type", 3).eq("carryOut", 1).last(" and day = '" + sdf.format(new Date()) + "' and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)"));
        //生成每个活动从开始上班到当前时间的时长记录
        for (DriverActivityHistory driverActivityHistory : driverActivityHistories) {
            String value = redisUtil.getValue("driverActivity_" + driverId + "_" + driverActivityHistory.getId());
@@ -164,10 +164,10 @@
                JSONObject jsonObject = JSON.parseObject(value);
                Long startTime = jsonObject.getLong("startTime");
                long time = System.currentTimeMillis() - startTime;
                redisUtil.setStrValue("driverActivity_" + driverId + "_" + driverActivityHistory.getId(), "{\"startTime\":" + startTime + ", \"time\":" + time + "}");
                redisUtil.setStrValue("driverActivity_" + driverId + "_" + driverActivityHistory.getId(), "{\"startTime\":" + startTime + ", \"time\":" + time + "}", 172800);
            }else{
                long time = System.currentTimeMillis() - driverWork.getStartTime().getTime();
                redisUtil.setStrValue("driverActivity_" + driverId + "_" + driverActivityHistory.getId(), "{\"startTime\":" + driverWork.getStartTime().getTime() + ", \"time\":" + time + "}");
                redisUtil.setStrValue("driverActivity_" + driverId + "_" + driverActivityHistory.getId(), "{\"startTime\":" + driverWork.getStartTime().getTime() + ", \"time\":" + time + "}", 172800);
            }
        }
    }
@@ -280,7 +280,7 @@
    public void deductionDuration1() {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.selectList(new EntityWrapper<DriverActivityHistory>()
                .eq("type", 3).eq("carryOut", 1).last(" and day = '" + sdf.format(new Date()) + "'"));
                .eq("type", 3).eq("carryOut", 1).last(" and day = '" + sdf.format(new Date()) + "' and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)"));
        for (DriverActivityHistory driverActivityHistory : driverActivityHistories) {
            DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driverActivityHistory.getDriverId()).eq("state", 1));
            if(null == driverWork){
@@ -361,7 +361,7 @@
                    driverOnline.setDuration(driverOnline.getDuration() + (time * 60));
                    this.updateById(driverOnline);
                }
                redisUtil.setStrValue("driverActivity_" + driverActivityHistory.getDriverId() + "_" + driverActivityHistory.getId(), "{\"startTime\":" + System.currentTimeMillis() + ", \"time\":" + 0 + "}");
                redisUtil.setStrValue("driverActivity_" + driverActivityHistory.getDriverId() + "_" + driverActivityHistory.getId(), "{\"startTime\":" + System.currentTimeMillis() + ", \"time\":" + 0 + "}", 172800);
            }
        }
    }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -331,6 +331,7 @@
                BigDecimal bigDecimal = new BigDecimal("0");
                for(Map<String, Object> map : query){
                    DriverActivityHistory dah = new DriverActivityHistory();
                    dah.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
                    dah.setDriverId(uid);
                    dah.setType(1);
@@ -526,6 +527,7 @@
                BigDecimal bigDecimal = new BigDecimal("0");
                for(Map<String, Object> map : query){
                    DriverActivityHistory dah = new DriverActivityHistory();
                    dah.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
                    dah.setDriverId(uid);
                    dah.setType(1);
@@ -1094,22 +1096,6 @@
                loginWarpper.setJumpCode("200000");
            }
        }
    
        //司机登录，添加谷歌上的车辆信息
        Car car = carService.selectById(driver.getCarId());
        if(null == car){
            return ResultUtil.error(language == 1 ? "登录失败，请先绑定车辆" : language == 2 ? "Login failed, please bind the vehicle first" : "La connexion a échoué, veuillez d’abord lier le véhicule");
        }
        if(!StringUtils.hasLength(car.getVehicleId())){
            car.setVehicleId(UUIDUtil.getRandomCode());
            carService.updateById(car);
        }
        String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
        if(ToolUtil.isEmpty(vehicles)){
            CarModel carModel = carModelMapper.selectById(car.getCarModelId());
            fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
        }
        loginWarpper.setVehicleId(car.getVehicleId());
        return ResultUtil.success(loginWarpper);
    }

@@ -1211,6 +1197,7 @@
            String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
            if(ToolUtil.isEmpty(vehicles)){
                fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
                fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
            }else{
                fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
            }
@@ -1251,6 +1238,8 @@
            if(car.getAuthState()==4){
                return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
            }
    
    
            driverWork = new DriverWork();
            driverWork.setState(1);
            driverWork.setDriverId(uid);
@@ -1269,6 +1258,7 @@
            String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
            if(ToolUtil.isEmpty(vehicles)){
                fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
                fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
            }else{
                fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
            }
@@ -1287,6 +1277,7 @@
        }
        this.updateById(driver);
        loginWarpper.setAudioUrl(audioUrl);
        loginWarpper.setVehicleId(car.getVehicleId());
        return ResultUtil.success(loginWarpper);
    }

@@ -1411,13 +1402,6 @@
                    break;
            }
            maps.add(baseWarpper);
        }
        DriverOrders query = driverOrdersMapper.query(uid, 1);
        if(null == query){
            query = new DriverOrders();
            query.setDriverId(uid);
            query.setType(1);
            driverOrdersMapper.insert(query);
        }
        return maps;
    }
@@ -1856,6 +1840,7 @@
            for(Map<String, Object> map : query){
                for(Driver driver : drivers){
                    DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                    driverActivityHistory.setType(1);
                    driverActivityHistory.setDriverId(driver.getId());
@@ -1983,6 +1968,7 @@
            for(Map<String, Object> map : query){
                for(Driver driver : drivers){
                    DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                    driverActivityHistory.setType(2);
                    driverActivityHistory.setDriverId(driver.getId());
@@ -2106,6 +2092,7 @@
                DriverActivityOnline driverActivityOnline = driverActivityOnlineMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
                for(Driver driver : drivers){
                    DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                    driverActivityHistory.setType(3);
                    driverActivityHistory.setDriverId(driver.getId());
@@ -2229,6 +2216,7 @@
                DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(Integer.valueOf(String.valueOf(map.get("id"))));
                for(Driver driver : drivers){
                    DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
                    driverActivityHistory.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                    driverActivityHistory.setType(4);
                    driverActivityHistory.setDriverId(driver.getId());

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -575,13 +575,13 @@
        String address = reverseGeocode.getAddress();
        switch (orderType){
            case 1://专车
                return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language);
                return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language, uid);
            case 2://出租
//                return orderTaxiService.process(orderId, state, lon, lat, address);
            case 3://城际
//                return orderCrossCityService.process(orderId, state, lon, lat, address);
            case 4://同城小件
                return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language);
                return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language, uid);
            case 5://跨城小件
//                return orderLogisticsService.process(orderId, state, lon, lat, address);
            case 6:

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java

@@ -99,13 +99,13 @@
        Driver driver1 = driverService.selectById(driverId);
        SettlementRecord settlementRecord = this.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
        if(null == settlementRecord){
            return ResultUtil.error(language == 1 ? "暂无需支付" : language == 2 ? "No need to make payments for the time being" : "Pas besoin d’effectuer de paiements pour le moment");
            return ResultUtil.error(language == 1 ? "暂无需支付" : language == 2 ? "No payment is required" : "Aucun paiement n’est requis");
        }
        Double payMoney = settlementRecord.getPayMoney();
        ResultUtil resultUtil = ResultUtil.success("");
        if(payType == 1){//手机支付
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String merchantTransactionId = sdf.format(new Date()) + language + settlementRecord.getId();
            String merchantTransactionId = sdf.format(new Date()) + language + payType + settlementRecord.getId();
            CheckoutRequest checkoutRequest = new CheckoutRequest();
            checkoutRequest.setMsisdn(Long.valueOf(driver1.getPhone()));
            checkoutRequest.setCustomerEmail(driver1.getEmail());
@@ -129,7 +129,7 @@
        if(payType == 2){//银行卡支付
            BankCard bankCard = bankCardService.selectById(bankCardId);
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String merchantTransactionId = sdf.format(new Date()) + language + settlementRecord.getId();
            String merchantTransactionId = sdf.format(new Date()) + language + payType + settlementRecord.getId();
            CheckoutRequest checkoutRequest = new CheckoutRequest();
            checkoutRequest.setMsisdn(Long.valueOf(bankCard.getCode()));
            checkoutRequest.setCustomerEmail(driver1.getEmail());