sz

src/main/java/com/jpsoft/epay/modules/base/controller/RechargeRecordController.java

@@ -209,6 +209,7 @@ public class RechargeRecordController {
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String id,
+            @RequestParam(name="serialNumber",defaultValue = "") String serialNumber,
             @RequestParam(name="pageIndex",defaultValue = "1") int pageIndex,
             @RequestParam(name="pageSize",defaultValue = "10") int pageSize,
             @RequestAttribute String subject){
@@ -227,6 +228,11 @@ public class RechargeRecordController {
             searchParams.put("id","%" + id + "%");
         }
 
+        if (StringUtils.isNotEmpty(serialNumber)) {
+            searchParams.put("serialNumber","%" + serialNumber + "%");
+        }
+
+
         Page<RechargeRecord> page = rechargeRecordService.pageSearch(searchParams,pageIndex,pageSize,sortList);
         List<RechargeRecord> resultRecordList = new ArrayList<>();
         List<RechargeRecord> recordList = page.getResult();

src/main/java/com/jpsoft/epay/modules/base/entity/RechargeRecord.java

@@ -270,6 +270,8 @@ public class RechargeRecord {
 	/**
 	 *获取支付时间
 	 */
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	public Date getPaymentTime(){
 		return paymentTime;
 	}

src/main/resources/mapper/base/RechargeRecord.xml

@@ -146,6 +146,9 @@
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
+			<if test="searchParams.serialNumber != null">
+				and serial_number like #{searchParams.serialNumber}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}