乘客管理增加购票方式字段

common/src/main/java/com/jpsoft/bus/modules/base/dao/OrderInfoDAO.java

@@ -29,6 +29,8 @@ public interface OrderInfoDAO {
 
     OrderInfo findByPassengerIdMergeOrderId(String passengerId, String mergeOrderId);
 
+	OrderInfo findByPassengerId(String passengerId);
+
     BigDecimal paySum(List<VehicleInfo> vehicleInfoList, String companyId,String payName, Date beginOfDay, Date endOfDay, Boolean settlementFlag);
 
     Integer payNum(List<VehicleInfo> vehicleInfoList,String companyId, String payName, Date beginOfDay, Date endOfDay, Boolean settlementFlag);

common/src/main/java/com/jpsoft/bus/modules/base/service/OrderInfoService.java

@@ -28,6 +28,8 @@ public interface OrderInfoService {
 
     OrderInfo findByPassengerIdMergeOrderId(String id, String mergeOrderId);
 
+	OrderInfo findByPassengerId(String passengerId);
+
 
 	/**
 	 * 订单在线退款

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

@@ -113,6 +113,11 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 		return orderInfoDAO.findByPassengerIdMergeOrderId(id,mergeOrderId);
 	}
 
+	@Override
+	public OrderInfo findByPassengerId(String passengerId){
+		return orderInfoDAO.findByPassengerId(passengerId);
+	}
+
 	@Override
 	public Boolean refund(String orderId,String userId) throws Exception {
 

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

@@ -116,4 +116,7 @@ public class PassengerInfo {
         }
         return payStatusName;
     }
+
+    @ApiModelProperty(value = "购票方式")
+    private String payName;
 }

common/src/main/resources/mapper/base/OrderInfo.xml

@@ -273,6 +273,14 @@
 		]]>
 	</select>
 
+	<select id="findByPassengerId" resultMap="OrderInfoMap">
+		<![CDATA[
+		select * from base_order_info
+		where del_flag = 0
+		and passenger_id = #{passengerId} order by create_time asc limit 1
+		]]>
+	</select>
+
 	<select id="paySum" resultType="java.math.BigDecimal">
 		<![CDATA[
 		select SUM(a.pay_fee) from base_order_info a

web/src/main/java/com/jpsoft/bus/modules/bus/controller/PassengerInfoController.java

@@ -1,6 +1,8 @@
 package com.jpsoft.bus.modules.bus.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.base.entity.OrderInfo;
+import com.jpsoft.bus.modules.base.service.OrderInfoService;
 import com.jpsoft.bus.modules.common.dto.MessageResult;
 import com.jpsoft.bus.modules.common.dto.Sort;
 import com.jpsoft.bus.modules.bus.entity.PassengerInfo;
@@ -31,6 +33,9 @@ public class PassengerInfoController {
     @Autowired
     private PassengerInfoService passengerInfoService;
 
+    @Autowired
+    private OrderInfoService orderInfoService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<PassengerInfo> create(){
@@ -236,6 +241,29 @@ public class PassengerInfoController {
 
         Page<PassengerInfo> page = passengerInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (PassengerInfo passengerInfo:page) {
+
+            OrderInfo orderInfo = orderInfoService.findByPassengerId(passengerInfo.getId());
+
+            if(orderInfo!=null){
+                if(("wechat").equals(orderInfo.getPayName())){
+                    passengerInfo.setPayName("微信");
+                }
+                else if(("alipay").equals(orderInfo.getPayName())){
+                    passengerInfo.setPayName("支付宝");
+                }
+                else if(("cash").equals(orderInfo.getPayName())){
+                    passengerInfo.setPayName("现金");
+                }
+                else if(("ticket").equals(orderInfo.getPayName())){
+                    passengerInfo.setPayName("车票");
+                }
+            }
+
+
+        }
+
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));