diff --git a/pom.xml b/pom.xml
index 538c4cf6c..fc1069091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0
manage
- 1.2.26
+ 1.2.27
UTF-8
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 26c8dc166..0041dad26 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -929,18 +929,9 @@ public class RetailAppServiceImp implements RetailAppService {
params.put("dev_id", device.getString("dev_id"));
}
params.put("client_id", client_id);
- //去掉默认7天查询时间
-// if (StringUtils.isBlank(params.getString("from"))) {
-// Date now = new Date();
-// Date lastWeekDay = DateUtils.addDays(now, -7);
-// lastWeekDay = new DateTime(lastWeekDay.getTime()).withTimeAtStartOfDay().toDate();
-// params.put("from", lastWeekDay);
-// params.put("begin", lastWeekDay);
-// params.put("end", now);
-// params.put("to", now);
-// }
- PageList orders = orderMapper.listTransactionsForApp(params,
- new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
+ params.put("after_limit", (query.getPage()-1)*query.getLimit());
+ params.put("limit", query.getLimit());
+ List orders = orderMapper.listTransactionsForApp(params);
TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
ArrayList date_contains = new ArrayList<>();
for (JSONObject order : orders) {
@@ -1007,7 +998,9 @@ public class RetailAppServiceImp implements RetailAppService {
break;
}
}
- return PageListUtils.buildPageListResult(orders);
+ JSONObject result = new JSONObject();
+ result.put("data", orders);
+ return result;
}
@Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
index 761715ce8..e10baf602 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
@@ -60,7 +60,7 @@ public interface OrderMapper {
List listAnalysisClientCustomer(JSONObject params);
- PageList listTransactionsForApp(JSONObject params, PageBounds pageBounds);
+ List listTransactionsForApp(JSONObject params);
JSONObject findOrderById(@Param("order_id") String orderId,@Param("client_id") int clientId);
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 15daf75d3..4e7ac3866 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -1462,7 +1462,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
throw new InvalidShortIdException();
}
checkOrgPermission(manager, client);
- if (!client.containsKey("parent_client_id") && client.getBoolean("sub_manage")) {
+ if (!client.containsKey("parent_client_id") && client.getBooleanValue("sub_manage")) {
return clientAccountMapper.partnerAndSubPartnerAccounts(client.getIntValue("client_id"));
}
return clientAccountMapper.listPartnerAccounts(client.getIntValue("client_id"));
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 37fe01ba1..bf53b4cb7 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -34,6 +34,7 @@ import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
+import org.springframework.context.MessageSource;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -90,6 +91,8 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
private SysConfigManager sysConfigManager;
@Resource
private SmsSender smsSender;
+ @Resource
+ private MessageSource messageSource;
private final String RESET_CLIENT_ACCOUNT_PREFIX = "RESET_CLIENT_ACCOUNT";
private final String RESET_MANAGER_ACCOUNT_PREFIX = "RESET_MANAGER_ACCOUNT";
private final String[] FILE_KEYS = {"client_bank_file", "client_company_file", "client_id_file", "client_agree_file"};
@@ -647,7 +650,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
JSONObject result = new JSONObject();
result.put("client_less_file", false);
result.put("put_fail_pdf", "https://file.royalpay.com.au/open/2019/08/28/1566959635986_P1GuvCkuWINPhUJUqUQnz8E0u6Lgpx.pdf");
- result.put("end_date", sysConfigManager.getSysConfig().getString("client_auth_file_post_end_date"));
+ result.put("title", messageSource.getMessage("client.auth.file.title", null, RequestEnvironment.getLocale()));
List clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
boolean clientFilesIsLess = false;
for (int i = 0; i < FILE_KEYS.length; i++) {
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 84e0fbc5c..3617be041 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -746,6 +746,8 @@
and t.clearing_status=#{clearing_status}
+ ORDER BY transaction_time desc
+ LIMIT #{after_limit},#{limit}