java/TianMa.git

			@@ -1,6 +1,7 @@
			package com.stylefeng.guns.modular.system.warpper;


			import com.stylefeng.guns.modular.system.util.AESUtil;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;

			@@ -167,7 +168,7 @@
			orderDriverWarpper.setDriverId(null != map.get("driverId") ? Integer.valueOf(String.valueOf(map.get("driverId"))) : 0);
			orderDriverWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
			orderDriverWarpper.setAvatar(null != map.get("avatar") ? String.valueOf(map.get("avatar")) : "");
			orderDriverWarpper.setPhone(null != map.get("phone") ? String.valueOf(map.get("phone")) : "");
			orderDriverWarpper.setPhone(null != map.get("phone") ? AESUtil.encrypt(String.valueOf(map.get("phone"))) : "");
			orderDriverWarpper.setCarCode(null != map.get("carCode") ? String.valueOf(map.get("carCode")) : "");
			orderDriverWarpper.setCarName(null != map.get("carName") ? String.valueOf(map.get("carName")) : "");
			orderDriverWarpper.setScore(null != map.get("score") ? Double.valueOf(String.valueOf(map.get("score"))) : 0);

			@@ -1,5 +1,6 @@
			package com.stylefeng.guns.modular.taxi.controller;

			import com.alibaba.fastjson.JSON;
			import com.stylefeng.guns.modular.system.service.IDriverService;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.warpper.OrderDriverWarpper;
			@@ -41,6 +42,7 @@
			public ResultUtil<OrderDriverWarpper> queryOrderDriver(Integer id, Integer orderType){
			try {
			Map<String, Object> map = driverService.queryOrderDriver(id, orderType);
			System.out.println(JSON.toJSONString(map));
			// TODO: 2020/5/25 需要推送订单数据
			OrderDriverWarpper orderDriverWarpper = OrderDriverWarpper.getOrderDriverWarpper(map);
			return ResultUtil.success(orderDriverWarpper);

	UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderDriverWarpper.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/controller/TaxiDriverController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史