add 优化app交易流水查询sql分页、增加弹窗title返还

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.26</version>
+    <version>1.2.27</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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<JSONObject> 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<JSONObject> orders = orderMapper.listTransactionsForApp(params);
         TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
         ArrayList<String> 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

src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java

@@ -60,7 +60,7 @@ public interface OrderMapper {
 
     List<JSONObject> listAnalysisClientCustomer(JSONObject params);
 
-    PageList<JSONObject> listTransactionsForApp(JSONObject params, PageBounds pageBounds);
+    List<JSONObject> listTransactionsForApp(JSONObject params);
 
     JSONObject findOrderById(@Param("order_id") String orderId,@Param("client_id") int clientId);
 

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"));

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<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
         boolean clientFilesIsLess = false;
         for (int i = 0; i < FILE_KEYS.length; i++) {

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -746,6 +746,8 @@
             </if>
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
         </where>
+        ORDER BY transaction_time desc
+        LIMIT #{after_limit},#{limit}
     </select>
 
     <select id="findOrderById" resultType="com.alibaba.fastjson.JSONObject">

src/main/resources/i18n/msg_en.properties

@@ -113,3 +113,6 @@ sys.contract.info=Dear merchant, your service contract with ROYALPAY has expired
 contract.old.waring=Dear Valued Merchants ，to ensure we comply with the ATO, we will need to adjust our current service agreements to be exclusionary of GST. This will result in contractual changes to your agreement,please read it carefully.
 
 sys.mondelay.cancel.waring=Are you sure to quit this activity?
+
+client.auth.file.title=RoyalPay is committed to providing a secure and safe platform for Chinese payments. As a part of this we regularly participate in communication with Austrac and China's Foreign Exchange Regulator. To ensure your business is fully compliant, we require certain documents from you by the 31st of October. If you believe you may not be able to submit these documents on time please get in touch with us as soon as possible.
+

src/main/resources/i18n/msg_zh.properties

@@ -106,3 +106,5 @@ sys.contract.waring=尊敬的商户，您与ROYALPAY的服务合同还有{0}天
 sys.contract.info=尊敬的商户，您与ROYALPAY的服务合同已到期，为了不影响您的正常使用，请查看最新服务协议进行续约。
 contract.old.waring=尊敬的商户，RoyalPay于近期正式收到澳洲监管机构的通知，应澳大利亚税务局ATO的要求进行了合同上GST部分的相应调整。请仔细阅读合同条款并确认。
 sys.mondelay.cancel.waring=是否确认退出活动
+
+client.auth.file.title=应澳洲政府反洗钱监管机构Austrac和中国外汇监管相关要求，需要您配合补充完善基本资料以完成合规流程，截止时间2019年10月31日前，超期未提交将可能会影响您的正常交易，谢谢您的配合。