|
@@ -92,16 +92,17 @@ public class PosMachineController {
|
|
|
* @param userName
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping (value = "/selectPosPayOrdersList", method = RequestMethod.GET)
|
|
|
+ @RequestMapping (value = "/selectPosPayOrdersList", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public String selectPosPayOrdersList(@RequestParam Integer stationId, String beginTime, String endTime){
|
|
|
+ public String selectPosPayOrdersList(@RequestBody PayOrder request){
|
|
|
Gson gson =new Gson();
|
|
|
//返回结果集
|
|
|
ResultData resultData = null;
|
|
|
PayOrder payOrder = new PayOrder();
|
|
|
- payOrder.setStationId(stationId);
|
|
|
- payOrder.setBeginTime(beginTime);
|
|
|
- payOrder.setEndTime(endTime);
|
|
|
+ payOrder.setStationId(request.getStationId());
|
|
|
+ payOrder.setBeginTime(request.getBeginTime());
|
|
|
+ payOrder.setEndTime(request.getEndTime());
|
|
|
+ payOrder.setPayType(payOrder.getPayType());
|
|
|
payOrder.setStatus("1");
|
|
|
List<PayOrder> payOrders = payOrderService.selectPayOrderList(payOrder);
|
|
|
resultData = ResultData.success(payOrders);
|