支付宝微信回调添加购票类型

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

@@ -88,6 +88,7 @@ id_,open_id,passenger_id,read_status,create_by,create_time,update_by,update_time
 			b.pay_status as pay_status
 			from bus_passenger_message a
 			left join bus_passenger_info b on a.passenger_id = b.id_
+			left join bus_shift_info c on b.vehicle_shift_id = c.id_
 		]]>
 		<where>
 			a.del_flag = 0
@@ -104,6 +105,12 @@ id_,open_id,passenger_id,read_status,create_by,create_time,update_by,update_time
 			<if test="searchParams.readStatus != null">
 				and a.read_status = #{searchParams.readStatus}
 			</if>
+			<if test="searchParams.shiftStatus != null">
+				and c.status_ = #{searchParams.shiftStatus}
+			</if>
+			<if test="searchParams.shiftId != null">
+				and c.id_ = #{searchParams.shiftId}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -371,6 +371,7 @@ public class PassengerApiController {
 
         try {
 
+            boolean supply = false;
             List<ShiftInfo> shiftInfoList = shiftInfoService.findByVehicleIdAndStatus(id, "1");
 
             if (shiftInfoList.size() == 0) {
@@ -420,8 +421,23 @@ public class PassengerApiController {
                 }
             }
 
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("openId",openId);
+            searchParams.put("payStatus","2");
+            searchParams.put("shiftStatus","1");
+            searchParams.put("shiftId",shiftInfo.getId());
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            Page<PassengerMessage> page = passengerMessageService.pageSearch(searchParams,1,5,true,sortList);
+            if (page.getResult().size()>0){
+                supply = true;
+            }
+
 
             Map<String, Object> map = new HashMap<>();
+            map.put("supply",supply);
             map.put("totalAmount", totalAmount);
             map.put("list", passengerOrderDTOList);
             map.put("id", mergeOrderId);
@@ -919,10 +935,15 @@ public class PassengerApiController {
 
         try {
 
+            if (StringUtils.isBlank(openId)){
+                throw new Exception("openId为空");
+            }
+
 
             Map<String,Object> searchParams = new HashMap<>();
             searchParams.put("openId",openId);
             searchParams.put("payStatus","2");
+            searchParams.put("shiftStatus","1");
 
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("create_time","desc"));
@@ -992,6 +1013,10 @@ public class PassengerApiController {
 
         try {
 
+            if (StringUtils.isBlank(openId)){
+                throw new Exception("openId为空");
+            }
+
             Map<String,Object> searchParams = new HashMap<>();
             searchParams.put("openId",openId);
             searchParams.put("readStatus",false);

web/src/main/java/com/jpsoft/bus/modules/pay/alipay/AlipayController.java

@@ -116,6 +116,7 @@ public class AlipayController {
                                     passengerInfo.setTicketUpStationId(orderInfo.getTicketUpStationId());
                                     passengerInfo.setTicketDownStationId(orderInfo.getTicketDownStationId());
                                     passengerInfo.setPayStatus("1");
+                                    passengerInfo.setTicketType(orderInfo.getTicketType());
                                     passengerInfoService.update(passengerInfo);
                                 }
 

web/src/main/java/com/jpsoft/bus/modules/pay/wechat/WxPayController.java

@@ -202,6 +202,7 @@ public class WxPayController {
                                         passengerInfo.setTicketUpStationId(orderInfo.getTicketUpStationId());
                                         passengerInfo.setTicketDownStationId(orderInfo.getTicketDownStationId());
                                         passengerInfo.setPayStatus("1");
+                                        passengerInfo.setTicketType(orderInfo.getTicketType());
                                         passengerInfoService.update(passengerInfo);
                                     }