|
@@ -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);
|