|
@@ -227,7 +227,7 @@ public class OrderInfoController {
|
|
|
@RequestMapping(value = "pageList",method = RequestMethod.POST)
|
|
|
public MessageResult<Map> pageList(
|
|
|
String companyId,String licensePlateNumber,String outOrderNo,String transactionId,
|
|
|
- String shiftId,String createTimeRanges,String payTimeRanges,
|
|
|
+ String shiftId,String createTimeRanges,String payTimeRanges,Integer payStatus,
|
|
|
@RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
|
|
|
@RequestParam(value="pageSize",defaultValue="20") int pageSize,
|
|
|
@RequestAttribute String subject){
|
|
@@ -262,6 +262,10 @@ public class OrderInfoController {
|
|
|
searchParams.put("shiftId",shiftId);
|
|
|
}
|
|
|
|
|
|
+ if (payStatus!=null) {
|
|
|
+ searchParams.put("payStatus",payStatus);
|
|
|
+ }
|
|
|
+
|
|
|
if(StringUtils.isNotEmpty(createTimeRanges)){
|
|
|
String[] timeRangeArray = createTimeRanges.split(",");
|
|
|
String createBeginTime = "";
|