From e7cfd5ba8109f9ee64345c5428e3aba83c07caf9 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 15 九月 2022 16:02:01 +0800 Subject: [PATCH] 更新接口 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 1 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 22 +++ DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 16 ++ DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 1 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 14 ++ DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 261 +++++++++++++++++-------------------- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 27 ++- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 35 +++++ 8 files changed, 225 insertions(+), 152 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml index bb5e94a..624b2ca 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml @@ -66,6 +66,7 @@ <result column="pickUpCode" property="pickUpCode"/> <result column="isReassign" property="isReassign"/> <result column="reassignNotice" property="reassignNotice"/> + <result column="driverPay" property="driverPay"/> </resultMap> diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java index 6551ed8..4f23569 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java @@ -329,6 +329,12 @@ */ @TableField("reassignNotice") private Integer reassignNotice; + /** + * 司机支付状态(现金支付司机代支付)1待支付 2已支付 + * @return + */ + @TableField("driverPay") + private Integer driverPay; public Integer getId() { return id; @@ -827,6 +833,14 @@ this.reassignNotice = reassignNotice; } + public Integer getDriverPay() { + return driverPay; + } + + public void setDriverPay(Integer driverPay) { + this.driverPay = driverPay; + } + @Override public String toString() { return "OrderLogistics{" + diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml index 34c1e42..3b8afeb 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml @@ -76,6 +76,7 @@ <result column="oldState" property="oldState"/> <result column="telX" property="telX"/> <result column="bindId" property="bindId"/> + <result column="driverPay" property="driverPay"/> </resultMap> <select id="getSmsOrderList" resultType="com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar"> diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java index f50a09b..0454d53 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java @@ -155,7 +155,7 @@ @TableField("payManner") private Integer payManner; /** - * 支付方式(1=微信,2=支付宝,3=余额) + * 支付方式(1=手机支付,2=银行卡支付,3=余额支付,4=现金支付) */ @TableField("payType") private Integer payType; @@ -414,6 +414,12 @@ * 是否冻结(1=否,2=是) */ private Integer isFrozen; + /** + * 司机支付状态(现金支付司机代支付)1待支付 2已支付 + * @return + */ + @TableField("driverPay") + private Integer driverPay; public Integer getIsFrozen() { @@ -1049,6 +1055,14 @@ this.startMileage = startMileage; } + public Integer getDriverPay() { + return driverPay; + } + + public void setDriverPay(Integer driverPay) { + this.driverPay = driverPay; + } + @Override public String toString() { return "OrderPrivateCar{" + diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml index 3b2ef24..6f53aee 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml @@ -113,7 +113,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -185,7 +186,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -259,7 +261,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -359,7 +362,8 @@ DATE_FORMAT(a.getDriverLicenseDate, '%Y-%m-%d') as getDriverLicenseDate, (select GROUP_CONCAT(type Separator ',') from t_driver_service where driverId = a.id) as `type`, a.placeOfPractice as placeOfPractice, - a.driveCardImgUrl as driveCardImgUrl, + a.driveCardImgUrl1 as driveCardImgUrl1, + a.driveCardImgUrl2 as driveCardImgUrl2, b.drivingLicensePhoto,b.carModelId,b.carBrandId,a.carId, a.networkCarlssueImg as networkCarlssueImg, a.placeOfEmployment as placeOfEmployment, @@ -412,7 +416,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -485,7 +490,8 @@ a.driverContactAddress as driverContactAddress, a.driverAge as driverAge, a.driveCard as driveCard, - a.driveCardImgUrl as driveCardImgUrl, + a.driveCardImgUrl1 as driveCardImgUrl1, + a.driveCardImgUrl2 as driveCardImgUrl2, a.driverType as driverType, a.getDriverLicenseDate as getDriverLicenseDate, a.driverLicenseOn as driverLicenseOn, @@ -565,7 +571,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -646,7 +653,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, @@ -720,7 +728,8 @@ driverContactAddress as driverContactAddress, driverAge as driverAge, driveCard as driveCard, - driveCardImgUrl as driveCardImgUrl, + driveCardImgUrl1 as driveCardImgUrl1, + driveCardImgUrl2 as driveCardImgUrl2, driverType as driverType, getDriverLicenseDate as getDriverLicenseDate, driverLicenseOn as driverLicenseOn, diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java index 696c812..f948b13 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java @@ -9,7 +9,10 @@ import com.stylefeng.guns.core.shiro.ShiroUser; import com.stylefeng.guns.core.util.JwtTokenUtil; import com.stylefeng.guns.core.util.ToolUtil; +import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics; import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService; +import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; +import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService; import com.stylefeng.guns.modular.system.dao.*; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; @@ -124,6 +127,9 @@ @Autowired private ICityService cityService; + + @Autowired + private IOrderPrivateCarService orderPrivateCarService; @Autowired private IOrderLogisticsService orderLogisticsService; @@ -545,6 +551,22 @@ Map<String, Object> map = driverMapper.queryHomeData(uid); int size = this.queryMyActivity(uid, new Date()).size(); map.put("activity", size); + //获取司机待支付的现金支付订单推送司机支付 + new Thread(new Runnable() { + @Override + public void run() { + List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4) + .eq("driverPay", 1).eq("isDelete", 1)); + for (OrderPrivateCar orderPrivateCar : orderPrivateCars) { + pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1); + } + List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4) + .eq("isDelete", 1).eq("driverPay", 1)); + for (OrderLogistics orderLogistic : orderLogistics) { + pushUtil.pushOfflinePayment(2, orderLogistic.getDriverId(), orderLogistic.getId(), orderLogistic.getType()); + } + } + }).start(); return map; } diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java index 4f3a26d..61185f7 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java @@ -106,6 +106,41 @@ /** + * 线下支付数据推送 + * @param type + * @param uid + * @param orderId + * @param orderType + */ + public void pushOfflinePayment(Integer type, Integer uid, Integer orderId, Integer orderType){ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("code", 200); + jsonObject.put("msg", "SUCCESS"); + jsonObject.put("method", "OFFLINE_PAYMENT"); + Map<String, Object> map = new HashMap<>(); + map.put("orderId", orderId); + map.put("orderType", orderType); + jsonObject.put("data", map); + + //调用推送 + HttpHeaders headers = new HttpHeaders(); + // 以表单的方式提交 + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + //将请求头部和参数合成一个请求 + MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); + params.add("msg", jsonObject.toJSONString()); + params.add("id", String.valueOf(uid)); + params.add("type", String.valueOf(type)); + HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers); + String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class); + JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class); + if(jsonObject1.getIntValue("code") != 200){ + System.err.println(jsonObject1.getString("msg")); + } + } + + + /** * 改派完成后推送用户端提醒 * @param uid * @param orderId diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java index 127a9ba..26b82df 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java @@ -64,7 +64,9 @@ @ApiModelProperty("从业地行政区域代码") private String placeOfEmployment; @ApiModelProperty("驾驶证照片") - private String driveCardImgUrl; + private String driveCardImgUrl1; + @ApiModelProperty("驾驶证照片") + private String driveCardImgUrl2; @ApiModelProperty("网约车资格证照片") private String networkCarlssueImg; @ApiModelProperty("语言(1=简体中文,2=英语,3=法语)") @@ -89,70 +91,6 @@ @ApiModelProperty("二维码是否打开 true打开,false关闭") private Boolean qrCodeIsOpen; - public Double getLaveBusinessNextWeekMoney() { - return laveBusinessNextWeekMoney; - } - - public void setLaveBusinessNextWeekMoney(Double laveBusinessNextWeekMoney) { - this.laveBusinessNextWeekMoney = laveBusinessNextWeekMoney; - } - - public Boolean getQrCodeIsOpen() { - return qrCodeIsOpen; - } - - public void setQrCodeIsOpen(Boolean qrCodeIsOpen) { - this.qrCodeIsOpen = qrCodeIsOpen; - } - - public String getQrCode() { - return qrCode; - } - - public void setQrCode(String qrCode) { - this.qrCode = qrCode; - } - - public Integer getCarId() { - return carId; - } - - public void setCarId(Integer carId) { - this.carId = carId; - } - - public Integer getCarBrandId() { - return carBrandId; - } - - public void setCarBrandId(Integer carBrandId) { - this.carBrandId = carBrandId; - } - - public Integer getCarModelId() { - return carModelId; - } - - public void setCarModelId(Integer carModelId) { - this.carModelId = carModelId; - } - - public String getDrivingLicensePhoto() { - return drivingLicensePhoto; - } - - public void setDrivingLicensePhoto(String drivingLicensePhoto) { - this.drivingLicensePhoto = drivingLicensePhoto; - } - - public Integer getAuthState() { - return authState; - } - - public void setAuthState(Integer authState) { - this.authState = authState; - } - public Integer getId() { return id; } @@ -175,6 +113,22 @@ public void setName(String name) { this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; } public Integer getSex() { @@ -233,14 +187,6 @@ this.balance = balance; } - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - public Double getActivityMoney() { return activityMoney; } @@ -249,12 +195,36 @@ this.activityMoney = activityMoney; } + public Double getLaveActivityMoney() { + return laveActivityMoney; + } + + public void setLaveActivityMoney(Double laveActivityMoney) { + this.laveActivityMoney = laveActivityMoney; + } + public Double getBusinessMoney() { return businessMoney; } public void setBusinessMoney(Double businessMoney) { this.businessMoney = businessMoney; + } + + public Double getLaveBusinessMoney() { + return laveBusinessMoney; + } + + public void setLaveBusinessMoney(Double laveBusinessMoney) { + this.laveBusinessMoney = laveBusinessMoney; + } + + public Double getLaveBusinessNextWeekMoney() { + return laveBusinessNextWeekMoney; + } + + public void setLaveBusinessNextWeekMoney(Double laveBusinessNextWeekMoney) { + this.laveBusinessNextWeekMoney = laveBusinessNextWeekMoney; } public String getTaxiAptitudeCard() { @@ -337,12 +307,28 @@ this.placeOfPractice = placeOfPractice; } - public String getDriveCardImgUrl() { - return driveCardImgUrl; + public String getPlaceOfEmployment() { + return placeOfEmployment; } - public void setDriveCardImgUrl(String driveCardImgUrl) { - this.driveCardImgUrl = driveCardImgUrl; + public void setPlaceOfEmployment(String placeOfEmployment) { + this.placeOfEmployment = placeOfEmployment; + } + + public String getDriveCardImgUrl1() { + return driveCardImgUrl1; + } + + public void setDriveCardImgUrl1(String driveCardImgUrl1) { + this.driveCardImgUrl1 = driveCardImgUrl1; + } + + public String getDriveCardImgUrl2() { + return driveCardImgUrl2; + } + + public void setDriveCardImgUrl2(String driveCardImgUrl2) { + this.driveCardImgUrl2 = driveCardImgUrl2; } public String getNetworkCarlssueImg() { @@ -353,38 +339,6 @@ this.networkCarlssueImg = networkCarlssueImg; } - public String getPlaceOfEmployment() { - return placeOfEmployment; - } - - public void setPlaceOfEmployment(String placeOfEmployment) { - this.placeOfEmployment = placeOfEmployment; - } - - public Double getLaveActivityMoney() { - return laveActivityMoney; - } - - public void setLaveActivityMoney(Double laveActivityMoney) { - this.laveActivityMoney = laveActivityMoney; - } - - public Double getLaveBusinessMoney() { - return laveBusinessMoney; - } - - public void setLaveBusinessMoney(Double laveBusinessMoney) { - this.laveBusinessMoney = laveBusinessMoney; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - public Integer getLanguage() { return language; } @@ -393,38 +347,60 @@ this.language = language; } - @Override - public String toString() { - return "DriverInfoWarpper{" + - "id=" + id + - ", avatar='" + avatar + '\'' + - ", name='" + name + '\'' + - ", phone='" + phone + '\'' + - ", sex=" + sex + - ", licensePlate='" + licensePlate + '\'' + - ", brand='" + brand + '\'' + - ", carColor='" + carColor + '\'' + - ", orderNum=" + orderNum + - ", score=" + score + - ", balance=" + balance + - ", activityMoney=" + activityMoney + - ", laveActivityMoney=" + laveActivityMoney + - ", businessMoney=" + businessMoney + - ", laveBusinessMoney=" + laveBusinessMoney + - ", taxiAptitudeCard='" + taxiAptitudeCard + '\'' + - ", networkCarlssueDate='" + networkCarlssueDate + '\'' + - ", company='" + company + '\'' + - ", driverContactAddress_='" + driverContactAddress_ + '\'' + - ", idCard='" + idCard + '\'' + - ", idCardImgUrl1='" + idCardImgUrl1 + '\'' + - ", idCardImgUrl2='" + idCardImgUrl2 + '\'' + - ", getDriverLicenseDate='" + getDriverLicenseDate + '\'' + - ", type='" + type + '\'' + - ", placeOfPractice='" + placeOfPractice + '\'' + - ", placeOfEmployment='" + placeOfEmployment + '\'' + - ", driveCardImgUrl='" + driveCardImgUrl + '\'' + - ", networkCarlssueImg='" + networkCarlssueImg + '\'' + - '}'; + public Integer getAuthState() { + return authState; + } + + public void setAuthState(Integer authState) { + this.authState = authState; + } + + public Integer getCarBrandId() { + return carBrandId; + } + + public void setCarBrandId(Integer carBrandId) { + this.carBrandId = carBrandId; + } + + public Integer getCarModelId() { + return carModelId; + } + + public void setCarModelId(Integer carModelId) { + this.carModelId = carModelId; + } + + public String getDrivingLicensePhoto() { + return drivingLicensePhoto; + } + + public void setDrivingLicensePhoto(String drivingLicensePhoto) { + this.drivingLicensePhoto = drivingLicensePhoto; + } + + public Integer getCarId() { + return carId; + } + + public void setCarId(Integer carId) { + this.carId = carId; + } + + public String getQrCode() { + return qrCode; + } + + public void setQrCode(String qrCode) { + this.qrCode = qrCode; + } + + public Boolean getQrCodeIsOpen() { + return qrCodeIsOpen; + } + + public void setQrCodeIsOpen(Boolean qrCodeIsOpen) { + this.qrCodeIsOpen = qrCodeIsOpen; } public static DriverInfoWarpper getDriverInfoWarpper(Map<String, Object> map){ @@ -461,7 +437,8 @@ driverInfoWarpper.setGetDriverLicenseDate(null != map.get("getDriverLicenseDate") ? String.valueOf(map.get("getDriverLicenseDate")) : ""); driverInfoWarpper.setType(null != map.get("type") ? String.valueOf(map.get("type")) : ""); driverInfoWarpper.setPlaceOfPractice(null != map.get("placeOfPractice") ? String.valueOf(map.get("placeOfPractice")) : ""); - driverInfoWarpper.setDriveCardImgUrl(null != map.get("driveCardImgUrl") ? String.valueOf(map.get("driveCardImgUrl")) : ""); + driverInfoWarpper.setDriveCardImgUrl1(null != map.get("driveCardImgUrl1") ? String.valueOf(map.get("driveCardImgUrl1")) : ""); + driverInfoWarpper.setDriveCardImgUrl2(null != map.get("driveCardImgUrl2") ? String.valueOf(map.get("driveCardImgUrl2")) : ""); driverInfoWarpper.setNetworkCarlssueImg(null != map.get("networkCarlssueImg") ? String.valueOf(map.get("networkCarlssueImg")) : ""); driverInfoWarpper.setPlaceOfEmployment(null != map.get("placeOfEmployment") ? String.valueOf(map.get("placeOfEmployment")) : ""); driverInfoWarpper.setLaveActivityMoney(null != map.get("laveActivityMoney") ? Double.valueOf(String.valueOf(map.get("laveActivityMoney"))) : 0); -- Gitblit v1.7.1