提交代码

puzhibing

2024-02-19 5816ff2b23bbfe96291bb4cb3cc61d99d37fe986

提交代码

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qiniuyun.QNYAuth;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -52,9 +51,6 @@

    @Autowired
    private ICarService carService;

    @Autowired
    private ALiSendSms aLiSendSms;

    @Autowired
    private IOrderTaxiService orderTaxiService;

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -9,7 +9,7 @@
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IOrderService;
import com.stylefeng.guns.modular.system.service.IReassignService;
import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
//import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SystemException;
@@ -55,9 +55,9 @@
    @Autowired
    private PushUtil pushUtil;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;

//    @Autowired
//    private ChinaMobileUtil chinaMobileUtil;
//
    @Autowired
    private IOrderLogisticsService orderLogisticsService;

@@ -546,8 +546,8 @@
    @PostMapping("/base/order/test")
    public String test(String phoneA, String phoneB){
        try {
            Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, 28);
            System.err.println(JSON.toJSONString(map));
//            Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, 28);
//            System.err.println(JSON.toJSONString(map));
        }catch (Exception e){
            e.printStackTrace();
            return "";
@@ -559,7 +559,7 @@
    @PostMapping("/base/order/test_")
    public String test(String bindId){
        try {
            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId,"");
//            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId,"");
        }catch (Exception e){
            e.printStackTrace();
            return "";

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

@@ -88,8 +88,8 @@
    @Resource
    private RegionMapper regionMapper;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;
//    @Autowired
//    private ChinaMobileUtil chinaMobileUtil;

    /*@Autowired
    private ICBCPayUtil icbcPayUtil;*/
@@ -448,11 +448,11 @@
        //调用移动的小号接口
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
        Region region = regionMapper.query(geocode.get("districtCode"));
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
        if(String.valueOf(map.get("code")).equals("200")){
            orderCrossCity.setTelX(map.get("telX"));
            orderCrossCity.setBindId(map.get("bindId"));
        }
//        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderCrossCity.setTelX(map.get("telX"));
//            orderCrossCity.setBindId(map.get("bindId"));
//        }
        if(orderCrossCityWarpper.getTravelMode() == 2){//公务用车
            orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
            orderCrossCity.setPeopleNumber(lineShiftDriver.getLaveSeat());

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

@@ -46,8 +46,8 @@
    @Resource
    private RegionMapper regionMapper;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;
//    @Autowired
//    private ChinaMobileUtil chinaMobileUtil;

    @Autowired
    private PushUtil pushUtil;
@@ -67,8 +67,8 @@
    @Autowired
    private IIncomeService incomeService;

    @Autowired
    private ALiSendSms aLiSendSms;
//    @Autowired
//    private ALiSendSms aLiSendSms;



@@ -119,11 +119,11 @@
        //调用移动的小号接口
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
        Region region = regionMapper.query(geocode.get("districtCode"));
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderLogistics.getRecipientPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
        if(String.valueOf(map.get("code")).equals("200")){
            orderLogistics.setTelX(map.get("telX"));
            orderLogistics.setBindId(map.get("bindId"));
        }
//        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderLogistics.getRecipientPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderLogistics.setTelX(map.get("telX"));
//            orderLogistics.setBindId(map.get("bindId"));
//        }

        this.updateById(orderLogistics);


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

@@ -50,8 +50,8 @@
    @Autowired
    private GDMapGeocodingUtil gdMapGeocodingUtil;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;
//    @Autowired
//    private ChinaMobileUtil chinaMobileUtil;

    @Resource
    private RegionMapper regionMapper;
@@ -186,12 +186,12 @@
        //调用移动的小号接口
        /*Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
        Region region = regionMapper.query(geocode.get("districtCode"));*/
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
        if(String.valueOf(map.get("code")).equals("200")){
            orderPrivateCar.setTelX(map.get("telX"));
            orderPrivateCar.setBindId(map.get("bindId"));
        }
        System.out.println(map);
//        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderPrivateCar.setTelX(map.get("telX"));
//            orderPrivateCar.setBindId(map.get("bindId"));
//        }
//        System.out.println(map);
        this.updateById(orderPrivateCar);

        //如果是预约单，则不修改司机为服务中
@@ -420,11 +420,11 @@
            orderPrivateCar.setState(7);
        }

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



 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml

@@ -48,11 +48,12 @@
    <select id="queryIdleDataByDriverId" resultType="map">
        select
        a.id as id,
        CONCAT(a.carLicensePlate, '-',c.`name`, b.`name`, ' ', a.carColor) as name
        CONCAT(a.carLicensePlate, '-',c.`name`, b.`name`, ' ', a.carColor) as name,
        a.authState
        from t_car a
        left join t_car_model b on (a.carModelId = b.id)
        left join t_car_brand c on (b.brandId = c.id)
        where a.state = 1
        where a.state = 1 and a.authState != 3
        and a.driverId=#{driverId}
    </select>


 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java

@@ -128,23 +128,10 @@
                             String carPhoto, String insurancePhoto, Integer uid,Integer id) throws Exception {

        Car query = carMapper.query(licensePlate);
        if(id==null){
            if(null != query){
                return ResultUtil.error("车牌号已经使用");
            }
        }else{
            if(null != query && !id.equals(query.getId())){
                return ResultUtil.error("车牌号已经使用");
            }
        if(null != query){
            return ResultUtil.error("车牌号已经使用");
        }

        Car car = new Car();
        car.setDriverId(uid);
        car = carMapper.selectOne(car);
        if(car==null){
            car = new Car();
            car.setId(id);
        }
        car.setCarModelId(modelId);
        CarModel carModel = carModelMapper.selectById(modelId);
        car.setCarBrandId(carModel.getBrandId());
@@ -160,20 +147,15 @@
        car.setFranchiseeId(driver.getFranchiseeId());
        car.setInsertTime(new Date());
        car.setState(1);
        car.setAuthState(1);
        car.setAddType(1);
        car.setDriverId(uid);
        car.setAuthState(1);
        car.setAddObjectId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
                driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
        car.setIsPlatCar(company.getType() == 1 ? 1 : 2);
        this.insertOrUpdate(car);
        //判断司机是否已经关联车辆，未关联车辆默认关联当前车辆
        if(driver.getCarId()==null){
            driver.setCarId(car.getId());
            driverService.updateById(driver);
        }
        car.setDriverId(uid);
        this.insert(car);
        return ResultUtil.success();
    }
}

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

@@ -215,7 +215,7 @@
    public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) throws Exception {
        ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type);
        if(result.getCode() == 200 && null != uid){
            /*if(type == 2){
            if(type == 2){
                Driver driver = driverMapper.selectById(uid);
                List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
                BigDecimal bigDecimal = new BigDecimal("0");
@@ -223,6 +223,18 @@
                    if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
                        bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                        incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));

                        DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
                        driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
                        driverActivityHistory.setCarryOut(2);
                        driverActivityHistory.setDay(new Date());
                        driverActivityHistory.setDriverId(driver.getId());
                        driverActivityHistory.setInsertTime(new Date());
                        driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
                        driverActivityHistory.setType(1);
                        driverActivityHistoryMapper.insert(driverActivityHistory);


                    }
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -255,7 +267,7 @@
                        userCouponRecordMapper.insert(userCouponRecord);
                    }
                }
            }*/
            }
        }
        return result;
    }
@@ -466,9 +478,9 @@
        if(null == driver){
            return ResultUtil.error("账号未注册");
        }
        /*if(driver.getAuthState() == 1){
        if(driver.getAuthState() == 1){
            return ResultUtil.error("账号正在审核中，请耐心等待");
        }*/
        }
        if(driver.getAuthState() == 3){
            return ResultUtil.error("账号已被冻结，请联系管理员");
        }
@@ -555,6 +567,10 @@
    public ResultUtil work(Integer uid, String type) throws Exception {
        DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
        Driver driver = this.selectById(uid);
        if(null == driver.getCarId()){
            return ResultUtil.error("暂未绑定车辆");
        }

        if(null != driverWork){//作下班操作
            //检测是否有未完成的订单
            List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.common.constant.state.Order;
import com.stylefeng.guns.core.util.DateUtil;
@@ -58,9 +59,6 @@

    @Autowired
    private TaskUtil taskUtil;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;

    @Autowired
    private RedisUtil redisUtil;
@@ -749,10 +747,10 @@
    public void taskMidAxbUnBindSend() throws Exception {
        List<OrderTaxi> list = orderTaxiService.taskMidAxbUnBindSend();
        for(OrderTaxi orderTaxi : list){
            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
            if(!String.valueOf(map.get("code")).equals("200")){
                System.err.println(String.valueOf(map.get("msg")));
            }
//            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
//            if(!String.valueOf(map.get("code")).equals("200")){
//                System.err.println(String.valueOf(map.get("msg")));
//            }
            orderTaxi.setTelX("");
            orderTaxi.setBindId("");
        }
@@ -762,10 +760,10 @@

        List<OrderPrivateCar> list1 = orderPrivateCarService.taskMidAxbUnBindSend();
        for(OrderPrivateCar orderPrivateCar : list1){
            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
            if(!String.valueOf(map.get("code")).equals("200")){
                System.err.println(String.valueOf(map.get("msg")));
            }
//            Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
//            if(!String.valueOf(map.get("code")).equals("200")){
//                System.err.println(String.valueOf(map.get("msg")));
//            }
            orderPrivateCar.setTelX("");
            orderPrivateCar.setBindId("");
        }
@@ -787,57 +785,57 @@
            case 1:
                OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
                if(ToolUtil.isNotEmpty(orderPrivateCar.getBindId())){
                    Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
                    if(!String.valueOf(map1.get("code")).equals("200")){
                        System.err.println(String.valueOf(map1.get("msg")));
                    }
//                    Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
//                    if(!String.valueOf(map1.get("code")).equals("200")){
//                        System.err.println(String.valueOf(map1.get("msg")));
//                    }
                    //调用移动的小号接口
                    Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
                    Region region = regionMapper.query(geocode.get("districtCode"));
                    Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
                    if(String.valueOf(map.get("code")).equals("200")){
                        orderPrivateCar.setTelX(map.get("telX"));
                        orderPrivateCar.setBindId(map.get("bindId"));
                    }
//                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//                    if(String.valueOf(map.get("code")).equals("200")){
//                        orderPrivateCar.setTelX(map.get("telX"));
//                        orderPrivateCar.setBindId(map.get("bindId"));
//                    }
                    orderPrivateCarService.updateById(orderPrivateCar);
                }
                break;
            case 2:
                OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
                if(ToolUtil.isNotEmpty(orderTaxi.getBindId())){
                    Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
                    if(!String.valueOf(map1.get("code")).equals("200")){
                        System.err.println(String.valueOf(map1.get("msg")));
                    }
//                    Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
//                    if(!String.valueOf(map1.get("code")).equals("200")){
//                        System.err.println(String.valueOf(map1.get("msg")));
//                    }
                    //调用移动的小号接口
                    Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
                    Region region = regionMapper.query(geocode.get("districtCode"));
                    Driver driver = driverService.selectById(orderTaxi.getDriverId());
                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
                    if(String.valueOf(map.get("code")).equals("200")){
                        orderTaxi.setTelX(map.get("telX"));
                        orderTaxi.setBindId(map.get("bindId"));
                    }
//                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//                    if(String.valueOf(map.get("code")).equals("200")){
//                        orderTaxi.setTelX(map.get("telX"));
//                        orderTaxi.setBindId(map.get("bindId"));
//                    }
                    orderTaxiService.updateById(orderTaxi);
                }
                break;
            case 3:
                OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
                if(ToolUtil.isNotEmpty(orderCrossCity.getBindId())){
                    Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderCrossCity.getBindId(),orderCrossCity.getTelX());
                    if(!String.valueOf(map1.get("code")).equals("200")){
                        System.err.println(String.valueOf(map1.get("msg")));
                    }
//                    Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderCrossCity.getBindId(),orderCrossCity.getTelX());
//                    if(!String.valueOf(map1.get("code")).equals("200")){
//                        System.err.println(String.valueOf(map1.get("msg")));
//                    }
                    //调用移动的小号接口
                    Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
                    Region region = regionMapper.query(geocode.get("districtCode"));
                    Driver driver = driverService.selectById(orderCrossCity.getDriverId());
                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
                    if(String.valueOf(map.get("code")).equals("200")){
                        orderCrossCity.setTelX(map.get("telX"));
                        orderCrossCity.setBindId(map.get("bindId"));
                    }
//                    Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//                    if(String.valueOf(map.get("code")).equals("200")){
//                        orderCrossCity.setTelX(map.get("telX"));
//                        orderCrossCity.setBindId(map.get("bindId"));
//                    }
                    orderCrossCityService.updateById(orderCrossCity);
                }
                break;
@@ -1015,8 +1013,6 @@
    @Autowired
    private ISystemNoticeService systemNoticeService;

    @Autowired
    private ALiSendSms aLiSendSms;

    /**
     * 短信催收
@@ -1035,7 +1031,18 @@
                    order.setSmsTime(day);
                    //发送短信
                    if(order.getPassengersPhone()!=null){
                        String sData = aLiSendSms.sendSms1(order.getPassengersPhone(), "SMS_215342869", "{\"time\":\"" + DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss") + "\",\"money\":\"" + order.getOrderMoney() + "\"}");
                        //发送记录集合
                        JSONArray records = new JSONArray();
                        JSONObject record = new JSONObject();
                        //手机号
                        record.put("mobile", order.getPassengersPhone());
                        //替换变量
                        JSONObject param = new JSONObject();
                        param.put("date", DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss"));
                        param.put("amount", order.getOrderMoney());
                        record.put("tpContent", param);
                        records.add(record);
                        SMSUtil.sendSmsTp(103448L, records);
                    }
                    //添加消息记录
                    systemNoticeService.addSystemNotice(1, "有一笔订单未付款，请前往支付！", order.getUserId());
@@ -1046,7 +1053,18 @@
                    order.setSmsTime(day);
                    //发送短信
                    if(order.getPassengersPhone()!=null){
                        String sData = aLiSendSms.sendSms1(order.getPassengersPhone(), "SMS_215342869", "{\"time\":\"" + DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss") + "\",\"money\":\"" + order.getOrderMoney() + "\"}");
                        //发送记录集合
                        JSONArray records = new JSONArray();
                        JSONObject record = new JSONObject();
                        //手机号
                        record.put("mobile", order.getPassengersPhone());
                        //替换变量
                        JSONObject param = new JSONObject();
                        param.put("date", DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss"));
                        param.put("amount", order.getOrderMoney());
                        record.put("tpContent", param);
                        records.add(record);
                        SMSUtil.sendSmsTp(103448L, records);
                    }

                    //添加消息记录
@@ -1054,7 +1072,9 @@
                }
            }
        }
        orderPrivateCarService.updateBatchById(orderList);
        if(orderList.size() > 0){
            orderPrivateCarService.updateBatchById(orderList);
        }
    }
}


 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -226,9 +226,9 @@
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
//                for(Dispatch dispatch : dispatches){
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }
        }
        return resultUtil;
@@ -351,9 +351,9 @@
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
//                for(Dispatch dispatch : dispatches){
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }
        }
        return resultUtil;
@@ -406,9 +406,9 @@
                        map.put("orderId", reassign.getOrderId().toString());
                        map.put("orderType", reassign.getOrderType().toString());
                        List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                        for(Dispatch dispatch : dispatches){
                            jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                        }
//                        for(Dispatch dispatch : dispatches){
//                            jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                        }
                    }
                    query.setState(2);
                    query.setCode(order_id);
@@ -498,9 +498,9 @@
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
//                for(Dispatch dispatch : dispatches){
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }else{
                System.err.println("预支付数据异常（orderId = "  + id + ")");
            }

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java

@@ -28,10 +28,10 @@
    public boolean authentication(String name, String code){
        String url = "https://safrvcert.market.alicloudapi.com/safrv_2meta_id_name/";
        Map<String, String> header = new HashMap<>();
        header.put("Authorization", "APPCODE b7d32437d08149099457dcb50fb57df2");
        header.put("Authorization", "APPCODE 1");
        Map<String, Object> param = new HashMap<>();
        param.put("__userId", "1732960796168165");
        param.put("verifyKey", "IVO4js5kValcdt");
        param.put("__userId", "1");
        param.put("verifyKey", "1");
        param.put("userName", name);
        param.put("identifyNum", code);
        String get = httpClientUtil.pushHttpRequset("GET", url, param, header, "form");

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java

File was deleted

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java

@@ -1,194 +1,194 @@
package com.stylefeng.guns.modular.system.util;

import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.CommonRequest;
import com.aliyuncs.CommonResponse;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.ecs.model.v20140526.DescribeInstancesRequest;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.exceptions.ServerException;
import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile;
import com.google.gson.Gson;
import com.stylefeng.guns.core.qr.ImgQrTool;
import com.stylefeng.guns.core.qr.QrImage;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.MD5Util;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

/**
 * 中国移动工具类
 */
@Component
public class ChinaMobileUtil {

    private static String APIKey = "LTAI4G1BpRaihVRZp1RS8Stn";

    private static String SecretKey = "PDR7uUEGNf0wIPPVCPCVdySgTwCr90";

    @Autowired
    private HttpClientUtil httpClientUtil;


    /**
     * 绑定小号
     * @param phoneA
     * @param phoneB
     * @param areaCode
     * @return
     * @throws Exception
     */
    public static Map<String, String> midAxbBindSend(String phoneA, String phoneB, Integer areaCode) throws Exception{
        Map<String, String> map1 = new HashMap<>();
        map1.put("code", "-1");
        map1.put("msg", "");
        map1.put("telX", "");
        map1.put("bindId", "");
        return map1;
        //暂时屏蔽-后期放开
        /*DefaultProfile profile = DefaultProfile.getProfile(
                "cn-hangzhou",            // 地域ID
                APIKey,        // 您的AccessKey ID
                SecretKey );  // 您的AccessKey Secret
        IAcsClient client = new DefaultAcsClient(profile);

        CommonRequest request = new CommonRequest();
        request.setMethod(MethodType.POST);
        request.setDomain("dyplsapi.aliyuncs.com");
        request.setVersion("2017-05-25");
        request.setAction("BindAxb");
        // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
        request.putQueryParameter("Expiration", DateUtil.format(new Date(new Date().getTime()+7 * 24 * 60 * 60*1000L),"yyyy-MM-dd HH:mm:ss"));
        // 号码池Key
        request.putQueryParameter("PoolKey", "FC100000119206151");
        // AXB中的B号码
        request.putQueryParameter("PhoneNoB", phoneB);
        // AXB中的A号码
        request.putQueryParameter("PhoneNoA", phoneA);
        // 指定城市进行X号码的选号。
        request.putQueryParameter("ExpectCity", "北京");
        // 是否需要针对该绑定关系产生的所有通话录制通话录音。
        request.putQueryParameter("IsRecordingEnabled", "false");
        Map<String, String> map1 = new HashMap<>();
        try {
            CommonResponse response = client.getCommonResponse(request);
            // 处理请求结果
            System.out.println(response.getData());
            JSONObject jsonObject = JSONObject.parseObject(response.getData());
            if(jsonObject.getString("Code").equals("OK")){
                map1.put("code", "200");
                map1.put("msg", jsonObject.getString("Message"));
                map1.put("telX", jsonObject.getJSONObject("SecretBindDTO").getString("SecretNo"));
                map1.put("bindId", jsonObject.getJSONObject("SecretBindDTO").getString("SubsId"));
            }else{
                map1.put("code", jsonObject.getString("Code"));
                map1.put("msg", jsonObject.getString("Message"));
            }
        } catch (ServerException e) {
            e.printStackTrace();
            map1.put("code", "-1");
            map1.put("msg", e.getErrMsg());
        } catch (ClientException e) {
            System.out.println("ErrCode:" + e.getErrCode());
            System.out.println("ErrMsg:" + e.getErrMsg());
            System.out.println("RequestId:" + e.getRequestId());
            map1.put("code", "-1");
            map1.put("msg", e.getErrMsg());
        }
        return map1;*/
    }


    /**
     * 解绑小号关系
     * @param bindId    绑定关系id
     * @return
     * @throws Exception
     */
    public static Map<String, String> midAxbUnBindSend(String bindId,String secretNo) throws Exception{
        DefaultProfile profile = DefaultProfile.getProfile(
                "cn-hangzhou",            // 地域ID
                APIKey,        // 您的AccessKey ID
                SecretKey );  // 您的AccessKey Secret
        IAcsClient client = new DefaultAcsClient(profile);

        CommonRequest request = new CommonRequest();
        request.setMethod(MethodType.POST);
        request.setDomain("dyplsapi.aliyuncs.com");
        request.setVersion("2017-05-25");
        request.setAction("UnbindSubscription");
        // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
        // 号码池Key
        request.putQueryParameter("PoolKey", "FC100000119206151");
        // 隐私号码。调用BindAXG等号码绑定接口时指定或自动分配的X号码。
        request.putQueryParameter("SecretNo", secretNo);
        // 绑定关系ID。
        //
        //可以在控制台的号码管理 > 号码详情中查看绑定关系ID，或者在调用BindAxb等号码绑定API时查看返回参数中的SubsId。
        request.putQueryParameter("SubsId", bindId);
        Map<String, String> map1 = new HashMap<>();
        try {
            CommonResponse response = client.getCommonResponse(request);
            // 处理请求结果
            System.out.println(response.getData());
            JSONObject jsonObject = JSONObject.parseObject(response.getData());
            if(jsonObject.getString("Code").equals("OK")){
                map1.put("code", "200");
                map1.put("msg", jsonObject.getString("Message"));
            }else{
                map1.put("code", jsonObject.getString("Code"));
                map1.put("msg", jsonObject.getString("Message"));
            }
        } catch (ServerException e) {
            e.printStackTrace();
            map1.put("code", "-1");
            map1.put("msg", e.getErrMsg());
        } catch (ClientException e) {
            System.out.println("ErrCode:" + e.getErrCode());
            System.out.println("ErrMsg:" + e.getErrMsg());
            System.out.println("RequestId:" + e.getRequestId());
            map1.put("code", "-1");
            map1.put("msg", e.getErrMsg());
        }
        return map1;
    }

    public static  void main(String[] args) throws IOException {
        try{
            // System.out.println(midAxbBindSend("18380476116","13688394165",null));
         System.out.println(midAxbUnBindSend("1000031640138366","17150145472"));
        }catch (Exception e){

        }

    }


    public Map<String, String> HeaderUtils(String APIKey, String SecretKey) throws Exception{
        Map<String, String> header = new HashMap<>();
        long time = System.currentTimeMillis();
        String signStr = MD5Util.encrypt(APIKey + SecretKey + time);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("apiKey", APIKey);
        jsonObject.put("time", time);
        jsonObject.put("sign", signStr);
        Base64 base64 = new Base64();
        String s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
        header.put("header", s);

        jsonObject = new JSONObject();
        jsonObject.put("platformId", "");
        jsonObject.put("secret", "");
        s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
        header.put("accessCode", s);
        return header;
    }
}
//package com.stylefeng.guns.modular.system.util;
//
//import com.alibaba.fastjson.JSONObject;
//import com.aliyuncs.CommonRequest;
//import com.aliyuncs.CommonResponse;
//import com.aliyuncs.DefaultAcsClient;
//import com.aliyuncs.IAcsClient;
//import com.aliyuncs.ecs.model.v20140526.DescribeInstancesRequest;
//import com.aliyuncs.exceptions.ClientException;
//import com.aliyuncs.exceptions.ServerException;
//import com.aliyuncs.http.MethodType;
//import com.aliyuncs.profile.DefaultProfile;
//import com.google.gson.Gson;
//import com.stylefeng.guns.core.qr.ImgQrTool;
//import com.stylefeng.guns.core.qr.QrImage;
//import com.stylefeng.guns.core.util.DateUtil;
//import com.stylefeng.guns.core.util.MD5Util;
//import org.apache.commons.codec.binary.Base64;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Component;
//
//import java.io.IOException;
//import java.util.Date;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * 中国移动工具类
// */
//@Component
//public class ChinaMobileUtil {
//
//    private static String APIKey = "1";
//
//    private static String SecretKey = "1";
//
//    @Autowired
//    private HttpClientUtil httpClientUtil;
//
//
//    /**
//     * 绑定小号
//     * @param phoneA
//     * @param phoneB
//     * @param areaCode
//     * @return
//     * @throws Exception
//     */
//    public static Map<String, String> midAxbBindSend(String phoneA, String phoneB, Integer areaCode) throws Exception{
//        Map<String, String> map1 = new HashMap<>();
//        map1.put("code", "-1");
//        map1.put("msg", "");
//        map1.put("telX", "");
//        map1.put("bindId", "");
//        return map1;
//        //暂时屏蔽-后期放开
//        /*DefaultProfile profile = DefaultProfile.getProfile(
//                "cn-hangzhou",            // 地域ID
//                APIKey,        // 您的AccessKey ID
//                SecretKey );  // 您的AccessKey Secret
//        IAcsClient client = new DefaultAcsClient(profile);
//
//        CommonRequest request = new CommonRequest();
//        request.setMethod(MethodType.POST);
//        request.setDomain("dyplsapi.aliyuncs.com");
//        request.setVersion("2017-05-25");
//        request.setAction("BindAxb");
//        // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
//        request.putQueryParameter("Expiration", DateUtil.format(new Date(new Date().getTime()+7 * 24 * 60 * 60*1000L),"yyyy-MM-dd HH:mm:ss"));
//        // 号码池Key
//        request.putQueryParameter("PoolKey", "FC100000119206151");
//        // AXB中的B号码
//        request.putQueryParameter("PhoneNoB", phoneB);
//        // AXB中的A号码
//        request.putQueryParameter("PhoneNoA", phoneA);
//        // 指定城市进行X号码的选号。
//        request.putQueryParameter("ExpectCity", "北京");
//        // 是否需要针对该绑定关系产生的所有通话录制通话录音。
//        request.putQueryParameter("IsRecordingEnabled", "false");
//        Map<String, String> map1 = new HashMap<>();
//        try {
//            CommonResponse response = client.getCommonResponse(request);
//            // 处理请求结果
//            System.out.println(response.getData());
//            JSONObject jsonObject = JSONObject.parseObject(response.getData());
//            if(jsonObject.getString("Code").equals("OK")){
//                map1.put("code", "200");
//                map1.put("msg", jsonObject.getString("Message"));
//                map1.put("telX", jsonObject.getJSONObject("SecretBindDTO").getString("SecretNo"));
//                map1.put("bindId", jsonObject.getJSONObject("SecretBindDTO").getString("SubsId"));
//            }else{
//                map1.put("code", jsonObject.getString("Code"));
//                map1.put("msg", jsonObject.getString("Message"));
//            }
//        } catch (ServerException e) {
//            e.printStackTrace();
//            map1.put("code", "-1");
//            map1.put("msg", e.getErrMsg());
//        } catch (ClientException e) {
//            System.out.println("ErrCode:" + e.getErrCode());
//            System.out.println("ErrMsg:" + e.getErrMsg());
//            System.out.println("RequestId:" + e.getRequestId());
//            map1.put("code", "-1");
//            map1.put("msg", e.getErrMsg());
//        }
//        return map1;*/
//    }
//
//
//    /**
//     * 解绑小号关系
//     * @param bindId    绑定关系id
//     * @return
//     * @throws Exception
//     */
//    public static Map<String, String> midAxbUnBindSend(String bindId,String secretNo) throws Exception{
//        DefaultProfile profile = DefaultProfile.getProfile(
//                "cn-hangzhou",            // 地域ID
//                APIKey,        // 您的AccessKey ID
//                SecretKey );  // 您的AccessKey Secret
//        IAcsClient client = new DefaultAcsClient(profile);
//
//        CommonRequest request = new CommonRequest();
//        request.setMethod(MethodType.POST);
//        request.setDomain("dyplsapi.aliyuncs.com");
//        request.setVersion("2017-05-25");
//        request.setAction("UnbindSubscription");
//        // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
//        // 号码池Key
//        request.putQueryParameter("PoolKey", "FC100000119206151");
//        // 隐私号码。调用BindAXG等号码绑定接口时指定或自动分配的X号码。
//        request.putQueryParameter("SecretNo", secretNo);
//        // 绑定关系ID。
//        //
//        //可以在控制台的号码管理 > 号码详情中查看绑定关系ID，或者在调用BindAxb等号码绑定API时查看返回参数中的SubsId。
//        request.putQueryParameter("SubsId", bindId);
//        Map<String, String> map1 = new HashMap<>();
//        try {
//            CommonResponse response = client.getCommonResponse(request);
//            // 处理请求结果
//            System.out.println(response.getData());
//            JSONObject jsonObject = JSONObject.parseObject(response.getData());
//            if(jsonObject.getString("Code").equals("OK")){
//                map1.put("code", "200");
//                map1.put("msg", jsonObject.getString("Message"));
//            }else{
//                map1.put("code", jsonObject.getString("Code"));
//                map1.put("msg", jsonObject.getString("Message"));
//            }
//        } catch (ServerException e) {
//            e.printStackTrace();
//            map1.put("code", "-1");
//            map1.put("msg", e.getErrMsg());
//        } catch (ClientException e) {
//            System.out.println("ErrCode:" + e.getErrCode());
//            System.out.println("ErrMsg:" + e.getErrMsg());
//            System.out.println("RequestId:" + e.getRequestId());
//            map1.put("code", "-1");
//            map1.put("msg", e.getErrMsg());
//        }
//        return map1;
//    }
//
//    public static  void main(String[] args) throws IOException {
//        try{
//            // System.out.println(midAxbBindSend("18380476116","13688394165",null));
//         System.out.println(midAxbUnBindSend("1000031640138366","17150145472"));
//        }catch (Exception e){
//
//        }
//
//    }
//
//
//    public Map<String, String> HeaderUtils(String APIKey, String SecretKey) throws Exception{
//        Map<String, String> header = new HashMap<>();
//        long time = System.currentTimeMillis();
//        String signStr = MD5Util.encrypt(APIKey + SecretKey + time);
//        JSONObject jsonObject = new JSONObject();
//        jsonObject.put("apiKey", APIKey);
//        jsonObject.put("time", time);
//        jsonObject.put("sign", signStr);
//        Base64 base64 = new Base64();
//        String s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
//        header.put("header", s);
//
//        jsonObject = new JSONObject();
//        jsonObject.put("platformId", "");
//        jsonObject.put("secret", "");
//        s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
//        header.put("accessCode", s);
//        return header;
//    }
//}

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java

@@ -12,9 +12,9 @@
public class OssUploadUtil {
    //OSS图片访问域名
    public static String oss_domain = "https://feimachuxing.oss-cn-beijing.aliyuncs.com/";
    public static String accessKeyId = "LTAI4G1BpRaihVRZp1RS8Stn";
    public static String accessKeySecret = "PDR7uUEGNf0wIPPVCPCVdySgTwCr90";
    public static String bucketName="feimachuxing";
    public static String accessKeyId = "1";
    public static String accessKeySecret = "1";
    public static String bucketName="1";
    public static String endpoint = "oss-cn-beijing.aliyuncs.com";
    
    public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/QrCodeUtil.java

@@ -28,8 +28,8 @@
    }
    public static String getQrCode(Integer uid){

        String appid="wx94a1a55229c933ac";//应用ID
        String appSecret="cbd89baf017146c1d56c00f1d2a59df6";//(应用密钥)
        String appid="1";//应用ID
        String appSecret="1";//(应用密钥)
        String urlToken ="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appid+"&secret="+appSecret+"";
        String backData=sendGet(urlToken, "utf-8", 10000);
        String accessToken = JSONObject.parseObject(backData).getString("access_token");

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -40,10 +40,10 @@
            driverService.taskMinute();
            //处于预约单
            orderService.reservationOrder();
            //处理车载端断电后的自动下班
            driverService.taskOffWork();
            //处理结束订单后30分钟解绑小号功能
            orderService.taskMidAxbUnBindSend();
//            处理车载端断电后的自动下班
//            driverService.taskOffWork();
//            处理结束订单后30分钟解绑小号功能
//            orderService.taskMidAxbUnBindSend();
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -60,7 +60,7 @@
            //处理未支付订单发送短信通知
            orderService.taskSmsSend();
            for (Integer id: driverIds){
                jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
//                jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
            }
            this.driverIds.clear();
        } catch (Exception e) {

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

@@ -58,9 +58,6 @@
    @Autowired
    private ISystemNoticeService systemNoticeService;

    @Autowired
    private ChinaMobileUtil chinaMobileUtil;

    @Resource
    private RegionMapper regionMapper;

@@ -183,11 +180,11 @@
        //调用移动的小号接口
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
        Region region = regionMapper.query(geocode.get("districtCode"));
        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
        if(String.valueOf(map.get("code")).equals("200")){
            orderTaxi.setTelX(map.get("telX"));
            orderTaxi.setBindId(map.get("bindId"));
        }
//        Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//        if(String.valueOf(map.get("code")).equals("200")){
//            orderTaxi.setTelX(map.get("telX"));
//            orderTaxi.setBindId(map.get("bindId"));
//        }

        this.updateById(orderTaxi);