|
|
@ -127,6 +127,7 @@ public class OutRechargeOrderController { |
|
|
|
@RequestParam(name = "rechargeContent", required = false) String rechargeContent, |
|
|
|
@RequestParam(name = "rechargeContent", required = false) String rechargeContent, |
|
|
|
@RequestParam(name = "userPhone", required = false) String userPhone, |
|
|
|
@RequestParam(name = "userPhone", required = false) String userPhone, |
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
|
|
|
@RequestParam(name = "code", required = false) Integer code, |
|
|
|
@RequestParam(name = "payTimeS", required = false) Long payTimeS, |
|
|
|
@RequestParam(name = "payTimeS", required = false) Long payTimeS, |
|
|
|
@RequestParam(name = "payTimeE", required = false) Long payTimeE, |
|
|
|
@RequestParam(name = "payTimeE", required = false) Long payTimeE, |
|
|
|
@RequestParam(name = "pageNum", required = true) Integer pageNum, |
|
|
|
@RequestParam(name = "pageNum", required = true) Integer pageNum, |
|
|
@ -155,7 +156,9 @@ public class OutRechargeOrderController { |
|
|
|
} |
|
|
|
} |
|
|
|
if (payType != null) { |
|
|
|
if (payType != null) { |
|
|
|
map.put("payType" , payType.toString()); |
|
|
|
map.put("payType" , payType.toString()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (code != null) { |
|
|
|
|
|
|
|
map.put("code" , code.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (payTimeS != null) { |
|
|
|
if (payTimeS != null) { |
|
|
|
map.put("payTimeS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payTimeS)); |
|
|
|
map.put("payTimeS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payTimeS)); |
|
|
@ -196,6 +199,7 @@ public class OutRechargeOrderController { |
|
|
|
@RequestParam(name = "rechargeContent", required = false) String rechargeContent, |
|
|
|
@RequestParam(name = "rechargeContent", required = false) String rechargeContent, |
|
|
|
@RequestParam(name = "userPhone", required = false) String userPhone, |
|
|
|
@RequestParam(name = "userPhone", required = false) String userPhone, |
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
|
|
|
@RequestParam(name = "code", required = false) Integer code, |
|
|
|
@RequestParam(name = "createTimeS", required = false) Long createTimeS, |
|
|
|
@RequestParam(name = "createTimeS", required = false) Long createTimeS, |
|
|
|
@RequestParam(name = "createTimeE", required = false) Long createTimeE, |
|
|
|
@RequestParam(name = "createTimeE", required = false) Long createTimeE, |
|
|
|
@RequestParam(name = "payTimeS", required = false) Long payTimeS, |
|
|
|
@RequestParam(name = "payTimeS", required = false) Long payTimeS, |
|
|
@ -209,6 +213,7 @@ public class OutRechargeOrderController { |
|
|
|
map.put("rechargeContent", rechargeContent); |
|
|
|
map.put("rechargeContent", rechargeContent); |
|
|
|
map.put("userPhone", userPhone); |
|
|
|
map.put("userPhone", userPhone); |
|
|
|
map.put("payType", payType); |
|
|
|
map.put("payType", payType); |
|
|
|
|
|
|
|
map.put("code", code); |
|
|
|
map.put("createTimeS", createTimeS); |
|
|
|
map.put("createTimeS", createTimeS); |
|
|
|
map.put("createTimeE", createTimeE); |
|
|
|
map.put("createTimeE", createTimeE); |
|
|
|
map.put("payTimeS", payTimeS); |
|
|
|
map.put("payTimeS", payTimeS); |
|
|
|