DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1832,8 +1832,15 @@ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), @ApiImplicitParam(value = "当前设备IP地址", name = "ip", required = true, dataType = "String"), @ApiImplicitParam(value = "当前设备mac地址", name = "mac", required = true, dataType = "String"), @ApiImplicitParam(value = "01 证联收银台支付\n" + "\t 04 HOME 页\n" + "\t 06 申请免密签约\n" + "\t 07 商户收银台支付\n" + "\t 08 开户（绑卡）\n" + "\t 09 开通支付账户\n" + "\t 10 打开付款码", name = "type", required = true, dataType = "String"), }) public ResultUtil<String> getZLToken(String ip, String mac, HttpServletRequest request){ public ResultUtil<String> getZLToken(String ip, String mac, String type, HttpServletRequest request){ try { Integer driverId = driverService.getUserIdFormRedis(request); if (null == driverId) { @@ -1850,6 +1857,7 @@ tradeTerminalInfo.setTerminal("1"); tradeTerminalInfo.setMac(mac); tokenRequest.setTradeTerminalInfo(tradeTerminalInfo); tokenRequest.setType(type); String token = TokenUtil.getToken(tokenRequest); return ResultUtil.success(token); }catch (Exception e){ DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.util.DateUtil; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService; import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityInfoWrapper; import com.stylefeng.guns.modular.crossCity.warpper.OrderWarpper; import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics; @@ -332,6 +331,9 @@ return ResultUtil.runErr(); } } @ResponseBody @PostMapping("/api/order/queryOrderInfo1") @@ -555,6 +557,10 @@ return ResultUtil.runErr(); } } @ResponseBody @PostMapping("/api/order/cancleOrder") @@ -572,6 +578,9 @@ return ResultUtil.runErr(); } } @ResponseBody @PostMapping("/api/order/updatePeopleNum") @ApiOperation(value = "修改人数", tags = {"司机端-服务中"}, notes = "") @@ -589,6 +598,8 @@ return ResultUtil.runErr(); } } @ResponseBody @PostMapping("/api/order/confirmFees1") @@ -724,30 +735,7 @@ } @ResponseBody @PostMapping("/base/order/test") public String test(String phoneA, String phoneB){ try { Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, (System.currentTimeMillis() + 86400000)); System.err.println(JSON.toJSONString(map)); }catch (Exception e){ e.printStackTrace(); return ""; } return null; } @ResponseBody @PostMapping("/base/order/test_") public String test(String bindId){ try { Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId, null, null); }catch (Exception e){ e.printStackTrace(); return ""; } return null; } /** @@ -780,6 +768,9 @@ } @ResponseBody @PostMapping("/api/order/queryVoiceBroadcast") @ApiOperation(value = "接单后获取语音播报内容", tags = {"司机端-首页"}, notes = "") @@ -826,6 +817,8 @@ } } @ResponseBody DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -443,6 +443,8 @@ private String promotionUser; private String promotionPhone; private String travelId; public String getPromotionUser() { @@ -1196,7 +1198,15 @@ public void setSplitAllocation(String splitAllocation) { this.splitAllocation = splitAllocation; } public String getTravelId() { return travelId; } public void setTravelId(String travelId) { this.travelId = travelId; } @Override public String toString() { return "OrderPrivateCar{" + DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -18,6 +18,7 @@ import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.CreateTravelItineraryRequest; import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; import org.springframework.beans.factory.annotation.Autowired; @@ -239,7 +240,7 @@ // 是否推广订单 Integer promotion = isPromotion(uid); Integer promotion = isPromotion(orderPrivateCar.getUserId()); if(promotion!=null){ orderPrivateCar.setPromotion(2); Driver driver1 = driverService.selectById(promotion); @@ -247,16 +248,41 @@ orderPrivateCar.setPromotionPhone(driver1.getPhone()); orderPrivateCar.setPromotionDriverId(promotion); } orderPrivateCar.setPromotion(promotion); UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId()); //调三方订单中心创建行程单 CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); request.setOrderNo("PR" + orderPrivateCar.getId()); request.setCustomerId(userInfo.getOnconUUID()); request.setDriverId(driver.getEmpId().toString()); String travelItinerary = OrderUtil.createTravelItinerary(request); // orderPrivateCar.set if(null == oldDriverId){ UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId()); Company company = companyService.selectById(driver.getCompanyId()); //调三方订单中心创建行程单 CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); request.setOrderNo("PR" + orderPrivateCar.getId()); request.setCustomerId(userInfo.getOnconUUID()); request.setDriverId(driver.getEmpId().toString()); request.setSupplierShopId(company.getEnterCode()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setServiceType(2); String travelItinerary = OrderUtil.createTravelItinerary(request); orderPrivateCar.setTravelId(travelItinerary); }else{ //改派抢单 Company company1 = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderPrivateCar.getTravelId()); request1.setStatus(orderPrivateCar.getState()); request1.setDriverId(driver.getEmpId().toString()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request1.setPromoterId(driver1.getEmpId().toString()); } request1.setSupplierShopId(company1.getEnterCode()); OrderUtil.modifyTravelItinerary(request1); } this.updateById(orderPrivateCar); //处理摆渡车的情况 @@ -533,6 +559,20 @@ break; } this.updateById(orderPrivateCar); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); Company company = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderPrivateCar.getTravelId()); request.setStatus(orderPrivateCar.getState()); request.setDriverId(driver.getEmpId().toString()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setSupplierShopId(company.getEnterCode()); OrderUtil.modifyTravelItinerary(request); // TODO: 2020/6/5 推送状态 OrderPrivateCar finalOrderPrivateCar = orderPrivateCar; @@ -600,20 +640,33 @@ orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney() + orderPrivateCar.getParkMoney() + orderPrivateCar.getRoadTollMoney()); orderPrivateCar.setState(7); this.updateById(orderPrivateCar); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); Company company = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderPrivateCar.getTravelId()); request.setStatus(7); request.setDriverId(driver.getEmpId().toString()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setSupplierShopId(company.getEnterCode()); OrderUtil.modifyTravelItinerary(request); pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据 systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId(), 1); //回滚司机状态为空闲 if(orderPrivateCar.getSpellSuccess()==0){ Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); driver.setState(2); driverService.updateById(driver); }else{ if(orderPrivateCar.getPid()==null){ Integer number = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6)); if(number<=0){ Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); driver.setState(2); driverService.updateById(driver); } @@ -621,7 +674,6 @@ Integer number = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6)); Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()).lt("state",6)); if(number<=0 && number1<=0){ Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); driver.setState(2); driverService.updateById(driver); } @@ -782,12 +834,25 @@ orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney() + orderPrivateCar.getParkMoney() + orderPrivateCar.getRoadTollMoney() + orderPrivateCar.getHolidayFee() + t); orderPrivateCar.setState(7); this.updateById(orderPrivateCar); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); Company company1 = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderPrivateCar.getTravelId()); request1.setStatus(orderPrivateCar.getState()); request1.setDriverId(driver.getEmpId().toString()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request1.setPromoterId(driver1.getEmpId().toString()); } request1.setSupplierShopId(company1.getEnterCode()); OrderUtil.modifyTravelItinerary(request1); pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据 systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId(), 1); //回滚司机状态为空闲 Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); driver.setState(2); driverService.updateById(driver);
@@ -16,13 +16,13 @@ import com.stylefeng.guns.modular.system.dao.RegionMapper; import com.stylefeng.guns.modular.system.dao.SysReformistMapper; import com.stylefeng.guns.modular.system.model.AdditionalFee; import com.stylefeng.guns.modular.system.model.Company; import com.stylefeng.guns.modular.system.model.Driver; import com.stylefeng.guns.modular.system.model.OrderPosition; import com.stylefeng.guns.modular.system.service.IAdditionalFeeService; import com.stylefeng.guns.modular.system.service.IDriverService; import com.stylefeng.guns.modular.system.service.IOpenCityService; import com.stylefeng.guns.modular.system.service.IOrderService; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest; import com.stylefeng.guns.modular.system.warpper.BaseWarpper; import com.stylefeng.guns.modular.system.warpper.OrderListWarpper; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; @@ -99,6 +99,9 @@ // private RedissonClient redissonClient; @Autowired private IOpenCityService openCityService; @Autowired private ICompanyService companyService; @@ -1181,6 +1184,21 @@ orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney()); orderPrivateCar.setState(8); orderPrivateCarService.updateById(orderPrivateCar); Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); Company company1 = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderPrivateCar.getTravelId()); request1.setStatus(orderPrivateCar.getState()); request1.setDriverId(driver.getEmpId().toString()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request1.setPromoterId(driver1.getEmpId().toString()); } request1.setSupplierShopId(company1.getEnterCode()); OrderUtil.modifyTravelItinerary(request1); userId = orderPrivateCar.getUserId(); driverId = orderPrivateCar.getDriverId(); state = orderPrivateCar.getState(); @@ -1210,6 +1228,21 @@ orderTaxi.setPayMoney(orderTaxi.getOrderMoney()); orderTaxi.setState(8); orderTaxiService.updateById(orderTaxi); Driver driver1 = driverService.selectById(orderTaxi.getDriverId()); Company company = companyService.selectById(driver1.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderTaxi.getTravelId()); request.setStatus(orderTaxi.getState()); request.setDriverId(driver1.getEmpId().toString()); if(2 == orderTaxi.getPromotion()){ Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId()); request.setPromoterId(driver2.getEmpId().toString()); } request.setSupplierShopId(company.getEnterCode()); OrderUtil.modifyTravelItinerary(request); userId = orderTaxi.getUserId(); driverId = orderTaxi.getDriverId(); state = orderTaxi.getState(); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -21,6 +21,8 @@ import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; import org.apache.commons.lang.time.DateFormatUtils; @@ -188,6 +190,20 @@ orderPrivateCar.setState(11); orderPrivateCar.setReassignNotice(2); orderPrivateCarService.updateById(orderPrivateCar); Company company = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderPrivateCar.getTravelId()); request.setStatus(orderPrivateCar.getState()); request.setDriverId(driver.getEmpId().toString()); if(2 == orderPrivateCar.getPromotion()){ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setSupplierShopId(company.getEnterCode()); OrderUtil.modifyTravelItinerary(request); //添加已收入明细 // incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney()); @@ -200,7 +216,20 @@ orderTaxi.setState(11); orderTaxi.setReassignNotice(2); orderTaxiService.updateById(orderTaxi); Company company1 = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderTaxi.getTravelId()); request1.setStatus(orderTaxi.getState()); request1.setDriverId(driver.getEmpId().toString()); if(2 == orderTaxi.getPromotion()){ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId()); request1.setPromoterId(driver1.getEmpId().toString()); } request1.setSupplierShopId(company1.getEnterCode()); OrderUtil.modifyTravelItinerary(request1); //添加已收入明细 // incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());
@@ -226,8 +226,6 @@ public static String createTravelItinerary(CreateTravelItineraryRequest request){ request.setScene("TRAFFIC"); request.setPartnerId("522700"); request.setSupplierShopId("981100006005951"); request.setServiceType(1); //请求路径 String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary"; //私钥文件 @@ -267,6 +265,8 @@ * @param request */ public static Boolean modifyTravelItinerary(ModifyTravelItineraryRequest request){ request.setScene("TRAFFIC"); request.setPartnerId("522700"); //请求路径 String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyTravelItinerary"; //私钥文件 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.java
@@ -1,5 +1,6 @@ package com.stylefeng.guns.modular.system.util.qianyuntong.model; import com.alipay.api.domain.GoodsInfo; import lombok.Data; import java.util.List; DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java
@@ -41,7 +41,6 @@ tokenRequest.setAppId(zhengLianConfig.getAppid()); tokenRequest.setType("04"); String reqBO = JSON.toJSONString(tokenRequest); // 生成对称加密秘钥 String key = ZhengLianUtil.generateKey(16); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
@@ -58,8 +58,8 @@ this.merchNo = "B00000871"; this.encrpNo = "1055490595"; this.signNo = "1066348524"; this.cer = "C:\\Users\\39373\\Desktop\\UAT-demo-公用\\1055490595.cer"; this.sm2 = "C:\\Users\\39373\\Desktop\\UAT-demo-公用\\871_111111.sm2"; this.cer = "C:\\Users\\Administrator\\Desktop\\1055490595.cer"; this.sm2 = "C:\\Users\\Administrator\\Desktop\\871_111111.sm2"; this.password = "111111"; } if("test".equals(activeProfile)){ DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import com.stylefeng.guns.modular.system.model.BaseBean; import java.math.BigDecimal; import java.util.Date; @@ -360,6 +359,8 @@ private String promotionUser; private String promotionPhone; private String travelId; public String getPromotionUser() { @@ -945,7 +946,15 @@ public void setSplitAllocation(String splitAllocation) { this.splitAllocation = splitAllocation; } public String getTravelId() { return travelId; } public void setTravelId(String travelId) { this.travelId = travelId; } @Override public String toString() { return "OrderTaxi{" + DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -12,6 +12,9 @@ import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.CreateTravelItineraryRequest; import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest; import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; @@ -220,7 +223,38 @@ orderTaxi.setPromotionPhone(driver1.getPhone()); orderTaxi.setPromotionDriverId(promotion); } if(null == oldDriverId){ UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId()); Company company = companyService.selectById(driver.getCompanyId()); //调三方订单中心创建行程单 CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); request.setOrderNo("TA" + orderTaxi.getId()); request.setCustomerId(userInfo.getOnconUUID()); request.setDriverId(driver.getEmpId().toString()); request.setSupplierShopId(company.getEnterCode()); if(2 == orderTaxi.getPromotion()){ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setServiceType(1); String travelItinerary = OrderUtil.createTravelItinerary(request); orderTaxi.setTravelId(travelItinerary); }else{ //改派抢单 Company company1 = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderTaxi.getTravelId()); request1.setStatus(orderTaxi.getState()); request1.setDriverId(driver.getEmpId().toString()); if(2 == orderTaxi.getPromotion()){ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId()); request1.setPromoterId(driver1.getEmpId().toString()); } request1.setSupplierShopId(company1.getEnterCode()); OrderUtil.modifyTravelItinerary(request1); } this.updateById(orderTaxi); if(orderTaxi.getType() == 2){ @@ -485,6 +519,20 @@ break; } this.updateById(orderTaxi); Driver driver = driverService.selectById(orderTaxi.getDriverId()); Company company = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderTaxi.getTravelId()); request.setStatus(orderTaxi.getState()); request.setDriverId(driver.getEmpId().toString()); if(2 == orderTaxi.getPromotion()){ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setSupplierShopId(company.getEnterCode()); OrderUtil.modifyTravelItinerary(request); // TODO: 2020/6/5 推送状态 new Thread(new Runnable() { @@ -528,9 +576,22 @@ orderTaxi.setState(7); } this.updateById(orderTaxi); Driver driver = driverService.selectById(orderTaxi.getDriverId()); Company company = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderTaxi.getTravelId()); request.setStatus(orderTaxi.getState()); request.setDriverId(driver.getEmpId().toString()); if(2 == orderTaxi.getPromotion()){ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId()); request.setPromoterId(driver1.getEmpId().toString()); } request.setSupplierShopId(company.getEnterCode()); OrderUtil.modifyTravelItinerary(request); //回滚司机状态为空闲 Driver driver = driverService.selectById(orderTaxi.getDriverId()); driver.setState(2); driverService.updateById(driver); @@ -568,9 +629,22 @@ orderTaxi.setState(7); } this.updateById(orderTaxi); Driver driver = driverService.selectById(orderTaxi.getDriverId()); Company company1 = companyService.selectById(driver.getCompanyId()); //中台修改订单状态 ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); request1.setOrderId(orderTaxi.getTravelId()); request1.setStatus(orderTaxi.getState()); request1.setDriverId(driver.getEmpId().toString()); if(2 == orderTaxi.getPromotion()){ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId()); request1.setPromoterId(driver1.getEmpId().toString()); } request1.setSupplierShopId(company1.getEnterCode()); OrderUtil.modifyTravelItinerary(request1); //回滚司机状态为空闲 Driver driver = driverService.selectById(orderTaxi.getDriverId()); driver.setState(2); driverService.updateById(driver);
@@ -1,120 +1,3 @@ server: port: 8007 guns: swagger-open: true #是否开启swagger (true/false) kaptcha-open: false #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: http://192.168.0.43/resources/ #图片服务器地址 spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 spring: application: name: driver-server profiles: active: dev mvc: static-path-pattern: /static/** view: prefix: /WEB-INF/view devtools: restart: enabled: false additional-paths: src/main/java exclude: static/**,WEB-INF/view/** servlet: multipart: max-request-size: 100MB max-file-size: 100MB redis: host: 192.168.110.80 port: 6379 password: 123456 database: 0 timeout: 1000 # cluster: # nodes: 127.0.0.1:6379 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular global-config: id-type: 0 #0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid) db-column-underline: false configuration: configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射 log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置 eureka: client: service-url: #注册中心地址 defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接 register-with-eureka: true #在注册中心进行注册 fetch-registry: true #从Eureka中获取注册信息。 --- spring: datasource: url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 db-name: qyttravel #用来搜集数据库的所有表 filters: wall,mergeStat --- spring: data: mongodb: uri: mongodb://192.168.110.80:27017/traveling_track --- wx: grantType: authorization_code #填authorization_code appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得 appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得 appletsAppid: wxcc3c9058e2b294db #小程序APPid appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 # mchId: 111 #微信支付分配的商户号 key: 111 #key为商户平台设置的密钥key： url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1} --- alipay: appid: 111 #应用程序唯一标识 appPrivateKey: 111 #开发者应用私钥 alipayPublicKey: 1 #应用公钥 alipay_public_key: 111 #支付宝公钥 --- juhe: #聚合数据 appKey: 111 # --- jiguang: appKey-driver: 111 #极光推送应用唯一标识 masterSecret-driver: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的 appKey-dispatch: 111 #极光推送应用唯一标识 masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的 --- #支付回调地址 #正式环境 callbackPath: https://traffic.qytzt.cn/driver --- #交通部推送数据功能开关 pushMinistryOfTransport: false --- rongyun: app_key: 111 app_secret: 111 active: "@spring.active@"
