乘客信息查询接口修改。

common/src/main/java/com/jpsoft/bus/modules/bus/dto/PassengerDetailDTO.java

@@ -17,6 +17,14 @@ public class PassengerDetailDTO {
 
     private String imageUrl;
 
+    private String upStationId;
+
+    private String upStationName;
+
+    private String downStationId;
+
+    private String downStationName;
+
     private String ticketUpStationId;
 
     private String ticketUpStationName;
@@ -25,6 +33,10 @@ public class PassengerDetailDTO {
 
     private String ticketDownStationName;
 
+    private String status;
+
+    private String statusName;
+
     private String payStatus;
 
     private String payStatusName;
@@ -32,9 +44,4 @@ public class PassengerDetailDTO {
     private List<PassengerOrderDTO> passengerOrderDTOList;
 
     private BigDecimal payFee;
-
-
-
-
-
 }

common/src/main/java/com/jpsoft/bus/modules/bus/entity/PassengerInfo.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,50 +12,50 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 /**
-  描述:bus_passenger_info的实体类
+ * 描述:bus_passenger_info的实体类
  */
 @Data
 @ApiModel(value = "bus_passenger_info的实体类")
 public class PassengerInfo {
-        @ApiModelProperty(value = "乘客表主键")
+    @ApiModelProperty(value = "乘客表主键")
     private String id;
-        @ApiModelProperty(value = "车辆班次编号")
+    @ApiModelProperty(value = "车辆班次编号")
     private String vehicleShiftId;
-        @ApiModelProperty(value = "车辆人员设备编号")
-    private Long  vehiclePersonId;
-        @ApiModelProperty(value = "注册用户编号")
+    @ApiModelProperty(value = "车辆人员设备编号")
+    private Long vehiclePersonId;
+    @ApiModelProperty(value = "注册用户编号")
     private Long userId;
-        @ApiModelProperty(value = "乘车人照片")
+    @ApiModelProperty(value = "乘车人照片")
     private String imageUrl;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "上车时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "上车时间")
     private Date upTime;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "下车时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "下车时间")
     private Date downTime;
-        @ApiModelProperty(value = "上车站点")
+    @ApiModelProperty(value = "上车站点")
     private String upStationId;
-        @ApiModelProperty(value = "下车站点")
+    @ApiModelProperty(value = "下车站点")
     private String downStationId;
-        @ApiModelProperty(value = "0-未乘车、1-上车、2-下车")
+    @ApiModelProperty(value = "0-未乘车、1-上车、2-下车")
     private String status;
-        @ApiModelProperty(value = "0-未购票、1-已购票，2-已过站，3-已补票")
+    @ApiModelProperty(value = "0-未购票、1-已购票，2-已过站，3-已补票")
     private String payStatus;
-        @ApiModelProperty(value = "创建人")
+    @ApiModelProperty(value = "创建人")
     private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-        @ApiModelProperty(value = "更新人")
+    @ApiModelProperty(value = "更新人")
     private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-        @ApiModelProperty(value = "是否删除")
+    @ApiModelProperty(value = "是否删除")
     private Boolean delFlag = false;
 
     @ApiModelProperty(value = "注册用户名")
@@ -66,19 +67,35 @@ public class PassengerInfo {
     @ApiModelProperty(value = "购票的下车站点")
     private String ticketDownStationId;
 
+    public String getStatusName(){
+        String statusName = "";
+
+        if ("0".equals(status)) {
+            statusName = "未乘车";
+        }
+        else if ("1".equals(status)) {
+            statusName = "上车";
+        }
+        else if ("2".equals(status)) {
+            statusName = "下车";
+        }
+
+        return statusName;
+    }
 
-    public String getPayStatusName(String payStatus){
+    public String getPayStatusName() {
         String payStatusName = "";
-        if ("0".equals(payStatus)){
+
+        if ("0".equals(payStatus)) {
             payStatusName = "未购票";
         }
-        if ("1".equals(payStatus)){
+        else if ("1".equals(payStatus)) {
             payStatusName = "已购票";
         }
-        if ("2".equals(payStatus)){
+        else if ("2".equals(payStatus)) {
             payStatusName = "已过站";
         }
-        if ("3".equals(payStatus)){
+        else if ("3".equals(payStatus)) {
             payStatusName = "已补票";
         }
         return payStatusName;

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/PassengerInfoServiceImpl.java

@@ -121,7 +121,6 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
             passengerInfo.setStatus("2");
             update(passengerInfo);
         } else {
-
             //查询此班次是否有已下车的记录
             List<PassengerInfo> passengerInfoList1 = findByPersonIdShiftIdStatus(Long.parseLong(personId), shiftInfo.getId(), "2");
             if (passengerInfoList1.size() == 0) {

web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -569,35 +569,71 @@ public class DriverApiController {
         MessageResult<PassengerDetailDTO> messageResult = new MessageResult<>();
 
         try {
-
-            PassengerDetailDTO passengerDetailDTO = null;
+            PassengerDetailDTO passengerDetailDTO = new PassengerDetailDTO();;
             VehicleInfo vehicleInfo = vehicleInfoService.get(subject);
             if (vehicleInfo == null){
                 throw new Exception("当前车辆不存在");
             }
+
             PassengerInfo passengerInfo = passengerInfoService.get(id);
+
             if (passengerInfo == null){
                 throw new Exception("无乘客记录");
             }
+
             List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(id,20);
 
+            passengerDetailDTO.setId(id);
+            passengerDetailDTO.setImageUrl(passengerInfo.getImageUrl());
+
+            passengerDetailDTO.setUpStationId(passengerInfo.getUpStationId());
+
+            //上车站点
+            StationInfo upStationInfo = stationInfoService.get(passengerInfo.getUpStationId());
+
+            if(upStationInfo!=null) {
+                passengerDetailDTO.setUpStationName(upStationInfo.getName());
+            }
+
+            passengerDetailDTO.setDownStationId(passengerInfo.getDownStationId());
+
+            //下车站点
+            StationInfo downStationInfo = stationInfoService.get(passengerInfo.getDownStationId());
+
+            if(downStationInfo!=null) {
+                passengerDetailDTO.setDownStationName(downStationInfo.getName());
+            }
+
+            passengerDetailDTO.setTicketUpStationId(passengerInfo.getTicketUpStationId());
+
+            //购票上车站点
+            StationInfo ticketUpStationInfo = stationInfoService.get(passengerInfo.getTicketUpStationId());
+
+            if(ticketUpStationInfo!=null) {
+                passengerDetailDTO.setTicketUpStationName(ticketUpStationInfo.getName());
+            }
+
+            //购票下车站点
+            passengerDetailDTO.setTicketDownStationId(passengerInfo.getTicketDownStationId());
+
+            StationInfo ticketDownStationInfo = stationInfoService.get(passengerInfo.getTicketDownStationId());
+
+            if(ticketDownStationInfo!=null) {
+                passengerDetailDTO.setTicketDownStationName(ticketDownStationInfo.getName());
+            }
+
+            passengerDetailDTO.setPayStatus(passengerInfo.getPayStatus());
+            passengerDetailDTO.setPayStatusName(passengerInfo.getPayStatusName());
+
+            //上下车状态
+            passengerDetailDTO.setStatus(passengerInfo.getStatus());
+            passengerDetailDTO.setStatusName(passengerInfo.getStatusName());
+
+            BigDecimal payFee = BigDecimal.ZERO;
+
+            List<PassengerOrderDTO> passengerOrderDTOList = new ArrayList<>();
+
             if (orderInfoList.size()>0){
-                PassengerDetailDTO passengerDetailDTO1 = new PassengerDetailDTO();
-                passengerDetailDTO1.setId(id);
-                passengerDetailDTO1.setImageUrl(passengerInfo.getImageUrl());
-                passengerDetailDTO1.setTicketUpStationId(passengerInfo.getTicketUpStationId());
-                StationInfo upStationInfo = stationInfoService.get(passengerInfo.getTicketUpStationId());
-                passengerDetailDTO1.setTicketUpStationName(upStationInfo.getName());
-                passengerDetailDTO1.setTicketDownStationId(passengerInfo.getTicketDownStationId());
-
-                StationInfo downStationInfo = stationInfoService.get(passengerInfo.getTicketDownStationId());
-
-                passengerDetailDTO1.setTicketDownStationName(downStationInfo.getName());
-                passengerDetailDTO1.setPayStatus(passengerInfo.getPayStatus());
-                passengerDetailDTO1.setPayStatusName(passengerInfo.getPayStatusName(passengerInfo.getPayStatus()));
-                BigDecimal payFee = BigDecimal.ZERO;
-
-                List<PassengerOrderDTO> passengerOrderDTOList = new ArrayList<>();
                 for (OrderInfo orderInfo : orderInfoList){
                     PassengerOrderDTO passengerOrderDTO = new PassengerOrderDTO();
                     passengerOrderDTO.setTicketType(orderInfo.getTicketType());
@@ -609,13 +645,10 @@ public class DriverApiController {
                     passengerOrderDTOList.add(passengerOrderDTO);
                     payFee = payFee.add(orderInfo.getPayFee());
                 }
-                passengerDetailDTO1.setPassengerOrderDTOList(passengerOrderDTOList);
-                passengerDetailDTO1.setPayFee(payFee);
-                passengerDetailDTO = passengerDetailDTO1;
-            }
-
-
 
+                passengerDetailDTO.setPassengerOrderDTOList(passengerOrderDTOList);
+                passengerDetailDTO.setPayFee(payFee);
+            }
 
             messageResult.setData(passengerDetailDTO);
             messageResult.setResult(true);
@@ -629,6 +662,35 @@ public class DriverApiController {
         return messageResult;
     }
 
+    @PostMapping("changePassengerStatus")
+    @ApiOperation(value="修改乘客乘车状态")
+    public MessageResult<PassengerInfo> changePassengerStatus(String id,String status,@RequestAttribute String subject){
+        MessageResult<PassengerInfo> messageResult = new MessageResult<>();
+
+        try {
+            String data = null;
+
+            //todo 填写具体代码
+            PassengerInfo passengerInfo = passengerInfoService.get(id);
+
+            passengerInfo.setStatus(status);
+            passengerInfo.setUpdateTime(new Date());
+            passengerInfo.setUpdateBy(subject);
+
+            passengerInfoService.update(passengerInfo);
+
+            messageResult.setData(passengerInfo);
+            messageResult.setResult(true);
+        }
+        catch (Exception ex){
+            log.error(ex.getMessage(),ex);
+
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
 
     @PostMapping("driverCreateOrder")
     @ApiOperation(value = "司机为乘客创建订单")
@@ -693,8 +755,6 @@ public class DriverApiController {
         MessageResult<Map> messageResult = new MessageResult<>();
 
         try {
-
-
             PriceInfo priceInfo = priceInfoService.findByStartStationAndEndStation(ticketUpStationId,ticketDownStationId);
             if (priceInfo == null){
                 PriceInfo priceInfo1 = priceInfoService.findByStartStationAndEndStation(ticketDownStationId,ticketUpStationId);
@@ -704,13 +764,18 @@ public class DriverApiController {
             }
 
             BigDecimal price = priceInfo.getPrice();
+
             if ("1".equals(ticketType)){
                 price = price.divide(new BigDecimal(2));
             }
+
             Map<String,Object> map = new HashMap<>();
             map.put("price",price);
             map.put("distance",priceInfo.getDistance());
 
+            map.put("upStation", stationInfoService.get(ticketUpStationId));
+            map.put("downStation", stationInfoService.get(ticketDownStationId));
+
             messageResult.setData(map);
             messageResult.setResult(true);
             messageResult.setCode(200);
@@ -772,14 +837,12 @@ public class DriverApiController {
     @PostMapping("busShiftAllStation")
     @ApiOperation(value = "车辆班次所有站点信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "令牌", paramType = "form"),
             @ApiImplicitParam(name = "subject", value = "目标(不传)", paramType = "form")
     })
-    public MessageResult<List<VehicleStationDTO>> busShiftAllStation(String token, @RequestAttribute String subject) {
+    public MessageResult<List<VehicleStationDTO>> busShiftAllStation(@RequestAttribute String subject) {
         MessageResult<List<VehicleStationDTO>> messageResult = new MessageResult<>();
 
         try {
-
             VehicleInfo vehicleInfo = vehicleInfoService.get(subject);
             if (vehicleInfo == null){
                 throw new Exception("当前车辆不存在");