乘客表增加购票类型

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

@@ -226,7 +226,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
             //乘客记录添加购票上车点和下车点
             passengerInfo.setTicketUpStationId(ticketUpStationId);
             passengerInfo.setTicketDownStationId(ticketDownStationId);
-
+            passengerInfo.setTicketType(ticketType);
 
             //乘客购票状态修改
             passengerInfo.setPayStatus("1");

common/src/main/resources/mapper/bus/PassengerInfo.xml

@@ -29,6 +29,7 @@
         <result property="ticketDownStationId" column="ticket_down_station_id"/>
         <result property="ticketUpStationName" column="ticket_up_station_name"/>
         <result property="ticketDownStationName" column="ticket_down_station_name"/>
+        <result property="ticketType" column="ticket_type"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.PassengerInfo">
         <!--
@@ -40,7 +41,7 @@
 		insert into bus_passenger_info
 	    (id_,vehicle_shift_id,vehicle_lib_id,vehicle_person_id,user_id,image_url,up_time,down_time,up_station_id,
 	    down_station_id,status_,pay_status,create_by,create_time,update_by,update_time,del_flag,
-	    ticket_up_station_id,ticket_down_station_id,local_image_url)
+	    ticket_up_station_id,ticket_down_station_id,local_image_url,ticket_type)
 		values
 		(
 			#{id,jdbcType=VARCHAR}
@@ -63,6 +64,7 @@
 			,#{ticketUpStationId,jdbcType=VARCHAR}
 			,#{ticketDownStationId,jdbcType=VARCHAR}
 			,#{localImageUrl,jdbcType=VARCHAR}
+			,#{ticketType,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -129,7 +131,9 @@
             <if test="ticketDownStationId!=null">
                 ticket_down_station_id=#{ticketDownStationId,jdbcType=VARCHAR},
             </if>
-
+            <if test="ticketType!=null">
+                ticket_type=#{ticketType,jdbcType=VARCHAR},
+            </if>
         </set>
         where id_=#{id}
     </update>

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

@@ -642,14 +642,14 @@ public class DriverApiController {
             sortList.add(new Sort("create_time","desc"));
             Page<PassengerInfo> page = passengerInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
-            for (PassengerInfo passengerInfo : page.getResult()) {
-                List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(),20);
+//            for (PassengerInfo passengerInfo : page.getResult()) {
+//                List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(),20);
 
                 //乘客最后一次购票信息
-                if (orderInfoList.size()>0){
-                    passengerInfo.setTicketType(orderInfoList.get(0).getTicketType());
-                }
-            }
+//                if (orderInfoList.size()>0){
+//                    passengerInfo.setTicketType(orderInfoList.get(0).getTicketType());
+//                }
+//            }
 
             messageResult.setData(PojoUtils.pageWrapper(page));
             messageResult.setResult(true);