补票逻辑完善

common/src/main/java/com/jpsoft/bus/modules/bus/service/PassengerInfoService.java

@@ -28,7 +28,7 @@ public interface PassengerInfoService {
 
     List<PassengerInfo> findByShiftStatusPayStatusNotTicketDown(String shiftId, String status, String payStatus,String ticketDownStationId);
 
-	void createOrder(VehicleInfo vehicleInfo, ShiftInfo shiftInfo,String openId,String mergeOrderId, String passengerIds, String ticketUpStationId, String ticketDownStationId, String ticketType, String goodsTicket, String totalFee) throws Exception;
+	String createOrder(VehicleInfo vehicleInfo, ShiftInfo shiftInfo,String openId,String mergeOrderId, String passengerIds, String ticketUpStationId, String ticketDownStationId, String ticketType, String goodsTicket, String totalFee) throws Exception;
 
 	void updatePassengerOrder(OrderInfo orderInfo, String ticketUpStationId, String ticketDownStationId, String ticketType, String goodsTicket, String totalFee);
 }

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

@@ -284,7 +284,8 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
     }
 
     @Override
-    public void createOrder(VehicleInfo vehicleInfo, ShiftInfo shiftInfo, String openId, String mergeOrderId,String passengerIds, String ticketUpStationId, String ticketDownStationId, String ticketType, String goodsTicket, String totalFee) throws Exception {
+    public String createOrder(VehicleInfo vehicleInfo, ShiftInfo shiftInfo, String openId, String mergeOrderId,String passengerIds, String ticketUpStationId, String ticketDownStationId, String ticketType, String goodsTicket, String totalFee) throws Exception {
+
 
 
         //乘客id集合
@@ -408,6 +409,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
         }
 
 
+        return mergeId;
     }
 
     @Override

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/PassengerApiController.java

@@ -593,8 +593,11 @@ public class PassengerApiController {
             ShiftInfo shiftInfo = shiftInfoList.get(0);
 
 
-            passengerInfoService.createOrder(vehicleInfo, shiftInfo, openId, mergeOrderId, passengerIds, ticketUpStationId, ticketDownStationId, ticketType, goodsTicket, totalFee);
+            String mergeId =  passengerInfoService.createOrder(vehicleInfo, shiftInfo, openId, mergeOrderId, passengerIds, ticketUpStationId, ticketDownStationId, ticketType, goodsTicket, totalFee);
 
+            Map<String,Object> map = new HashMap<>();
+            map.put("id",mergeId);
+            messageResult.setData(map);
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {