修改商户后台账户明细查询bug

README.md

@@ -111,6 +111,8 @@ roncoo-pay //龙果支付
 
 在线演示（后台管理）：http://demo.pay.roncoo.com/boss
 
+在线演示(商户系统)： http://demo.pay.roncoo.com/mch
+
 系统操作说明：https://blog.roncoo.com/article/124375
 
 系统详细介绍：https://blog.roncoo.com/article/124373

roncoo-pay-service/src/main/java/com/roncoo/pay/account/service/impl/RpAccountHistoryServiceImpl.java

 /*
  * Copyright 2015-2102 RonCoo(http://www.roncoo.com) Group.
- *  
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *  
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- *  
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@ public class RpAccountHistoryServiceImpl implements RpAccountHistoryService{
 
 	@Autowired
 	private RpAccountHistoryDao rpAccountHistoryDao;
-	
+
 	@Override
 	public void saveData(RpAccountHistory rpAccountHistory) {
 		rpAccountHistoryDao.insert(rpAccountHistory);
@@ -56,6 +56,7 @@ public class RpAccountHistoryServiceImpl implements RpAccountHistoryService{
 	public PageBean listPage(PageParam pageParam, RpAccountHistory rpAccountHistory) {
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 		paramMap.put("accountNo", rpAccountHistory.getAccountNo());
+		paramMap.put("userNo", rpAccountHistory.getUserNo());
 		return rpAccountHistoryDao.listPage(pageParam, paramMap);
 	}
-}
\ No newline at end of file
+}

roncoo-pay-web-merchant/src/main/resources/application.yml

@@ -3,6 +3,7 @@ server:
   servlet:
     session:
       timeout: 30m
+    context-path: /mch
 spring:
   application:
     name: roncoo-pay-web-merchant
@@ -13,4 +14,4 @@ spring:
 mybatis:
   mapper-locations: classpath:mybatis/mapper/*/*.xml
 logging:
-  config: classpath:logback.xml
\ No newline at end of file
+  config: classpath:logback.xml