派生自 java/IgoTravel
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/NettyController.java
@@ -1,6 +1,7 @@ package com.stylefeng.guns.modular.api; import com.alibaba.fastjson.JSON; import com.stylefeng.guns.modular.system.model.OrderPosition; import com.stylefeng.guns.modular.system.service.IDriverService; import com.stylefeng.guns.modular.system.service.INettyService; @@ -77,13 +78,13 @@ */ @ResponseBody @PostMapping("/base/netty/deleteTask") public ResultUtil deleteTask(Integer orderId, Integer orderType){ public String deleteTask(Integer orderId, Integer orderType){ try { pushUtil.removeTask(orderId, orderType); return ResultUtil.success(); return JSON.toJSONString(ResultUtil.success()); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); return JSON.toJSONString(ResultUtil.runErr()); } }
@@ -189,8 +189,12 @@ } }).start(); systemNoticeService.addSystemNotice(2, "您已成功抢得包裹订单，请及时联系客户！", orderLogistics.getDriverId()); systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId()); systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" : language == 2 ? "You have successfully captured the parcel order, please contact the customer in time!" : "Vous avez saisi avec succès la commande de colis, veuillez contacter le client à temps!", orderLogistics.getDriverId()); systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" : language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!" : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderLogistics.getUserId()); return ResultUtil.success(); } @@ -253,14 +257,14 @@ if(orderLogistics.getPayType() != 4){ //添加已收入明细 Company company = companyService.selectById(orderLogistics.getCompanyId()); Double speMoney = company.getCrossLogisticsMoney(); Double speMoney = company.getSameLogisticsMoney(); BigDecimal d = null;//企业收入 BigDecimal c = null;//司机收入 if(company.getIsCrossLogisticsFixedOrProportional() == 2){//固定 if(company.getIsSameLogisticsFixedOrProportional() == 2){//固定 d = new BigDecimal(speMoney); c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机 } if(company.getIsSpeFixedOrProportional() == 1){//比例 if(company.getIsSameLogisticsFixedOrProportional() == 1){//比例 Double price = orderLogistics.getOrderMoney(); d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))); c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN); @@ -884,8 +888,12 @@ } }).start(); systemNoticeService.addSystemNotice(2, "您已成功抢得出租车订单，请及时联系客户！", orderLogistics.getDriverId()); systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId()); systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得出租车订单，请及时联系客户！" : language == 2 ? "You have successfully captured the taxi order, please contact the customer in time!" : "Vous avez saisi avec succès la commande de taxi, veuillez contacter le client à temps!", orderLogistics.getDriverId()); systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" : language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!" : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderLogistics.getUserId()); return ResultUtil.success(); } DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -221,8 +221,12 @@ } }).start(); systemNoticeService.addSystemNotice(2, "您已成功抢得打车订单，请及时联系客户！", orderPrivateCar.getDriverId()); systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId()); systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得打车订单，请及时联系客户！" : language == 2 ? "You have successfully grabbed a taxi order, please contact the customer in time!" : "Vous avez saisi avec succès une commande de taxi, veuillez contacter le client à temps!", orderPrivateCar.getDriverId()); systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" : language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!" : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderPrivateCar.getUserId()); return ResultUtil.success(); }
@@ -588,6 +588,7 @@ // driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate()); driver.setDriveCardImgUrl1(registeredWarpper.getDriveCardImgUrl()); driver.setDriveCardImgUrl2(registeredWarpper.getDriveCardImgUrl2()); driver.setDriveCard(registeredWarpper.getDriveCard()); driver.setEmail(registeredWarpper.getEmail()); this.updateById(driver); @@ -1279,7 +1280,7 @@ Element pass1_user = document1.getElementById("pass1_user"); pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，"); } if(2 == language){ if(3 == language){ document1.getElementById("chinese").remove(); document1.getElementById("english").remove(); document1.getElementById("invite2").remove(); @@ -1365,6 +1366,9 @@ } if(car.getAuthState() == 3){ return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé"); } if(car.getAuthState() == 4){ return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle audit failed" : "Échec de l’audit du véhicule"); } boolean idle = carService.idle(carId); if(!idle){ @@ -1629,7 +1633,7 @@ } if (3 == language) { document1.getElementById("chinese").remove(); document1.getElementById("french").remove(); document1.getElementById("english").remove(); document1.getElementById("invite2").remove(); document1.getElementById("user2").remove(); document1.getElementById("settle2").remove(); DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
@@ -39,6 +39,8 @@ private String driveCardImgUrl; @ApiModelProperty("驾驶证照片背面") private String driveCardImgUrl2; @ApiModelProperty("驾驶证号") private String driveCard; public String getPhone() { @@ -169,6 +171,14 @@ this.birthday = birthday; } public String getDriveCard() { return driveCard; } public void setDriveCard(String driveCard) { this.driveCard = driveCard; } @Override public String toString() { return "RegisteredWarpper{" +
