add 弹窗+banner增加版本检测、商户端增加商户订单id、平台订单模糊查询、交易流水增加search框

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.56</version>
+    <version>1.3.57</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java

@@ -68,7 +68,7 @@ public interface RetailAppService {
 
     JSONObject getNoticeDetailById(JSONObject device, String noticeId);
 
-    List<JSONObject> getLatestNotice(int clientId);
+    List<JSONObject> getLatestNotice(JSONObject device, int clientId);
 
     void changeAccountPassword(JSONObject device, ChangePwdBean change, String accountId);
 

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -1505,7 +1505,7 @@ public class RetailAppServiceImp implements RetailAppService {
     }
 
     @Override
-    public List<JSONObject> getLatestNotice(int clientId) {
+    public List<JSONObject> getLatestNotice(JSONObject device, int clientId) {
         JSONObject clientConfig = clientConfigService.find(clientId);
         JSONObject notice = new JSONObject();
         JSONObject latestNotice = noticeManage.getLatestWindowNotice(clientId);
@@ -1595,7 +1595,8 @@ public class RetailAppServiceImp implements RetailAppService {
             act.put("data", latestAct);
             act.put("type", "popup");
             if (StringUtils.equalsIgnoreCase("跨境商城", latestAct.getString("act_name"))) {
-                if (!clientConfig.getBooleanValue("geek_shop_status")) {
+                if (clientConfig !=null && !clientConfig.getBooleanValue("geek_shop_status")
+                        && geekShowActVersion(device.getString("version"))) {
                     result.add(act);
                 }
             }else {
@@ -1764,9 +1765,18 @@ public class RetailAppServiceImp implements RetailAppService {
             List<JSONObject> newActs = new ArrayList<>();
             for (JSONObject act : JSON.parseArray(acts.toJSONString(), JSONObject.class)) {
                 if (act.getString("page_desc") != null && !act.getString("page_desc").equals("0")) {
+                    JSONObject reference = act.getJSONObject("reference");
+                    String geekUrl = "https://opt.royalpay.com.au/geekforbest/v1/operation/purpose_apply/index?source=app";
+                    if (reference != null && StringUtils.isNotBlank(reference.getString("url"))
+                            && StringUtils.equalsIgnoreCase(geekUrl, reference.getString("url"))) {
+                        if (geekShowActVersion(device.getString("version"))) {
+                            newActs.add(act);
+                        }
+                    }else {
                         newActs.add(act);
                     }
                 }
+            }
             res.put("data", newActs);
         }
         // 手续费返还活动
@@ -3053,4 +3063,17 @@ public class RetailAppServiceImp implements RetailAppService {
         res.put("channels", channels);
         return res;
     }
+
+    private boolean geekShowActVersion(String version) {
+        boolean result = false;
+        String geekShowVersion = "2.10.11";
+        String[] nowAppVersion = version.split("\\.");
+        String[] geekVersion = geekShowVersion.split("\\.");
+        for (int i = 0; i < geekVersion.length; i++) {
+            if (Integer.parseInt(nowAppVersion[i]) >= Integer.parseInt(geekVersion[i])) {
+                result = true;
+            }
+        }
+        return result;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -206,7 +206,7 @@ public class RetailAppController {
 
     @GetMapping("/notice/unread")
     public List<JSONObject> latestNotice(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
-        return retailAppService.getLatestNotice(device.getIntValue("client_id"));
+        return retailAppService.getLatestNotice(device,device.getIntValue("client_id"));
     }
     /* 消息模块end */
 

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

@@ -488,8 +488,8 @@
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
                     #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
-                    t.order_id = #{search_text}
+                    t.order_id = #{name_pattern}
-                    or o.client_order_id = #{search_text})
+                    or o.client_order_id = #{name_pattern})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and p.client_moniker=#{search_text}

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

@@ -156,6 +156,30 @@
         left join sys_customer_relation_alipay ra on ra.alipay_uid = o.customer_id
         LEFT JOIN sys_clients c on c.client_id = t.client_id
         <where>
+            <if test="search_text!=null">
+                <bind name="name_pattern" value="'%'+search_text+'%'"/>
+                <if test="text_type=='all'">
+                    and (o.order_detail like
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
+                    t.order_id = #{name_pattern}
+                    or o.client_order_id = #{name_pattern})
+                </if>
+                <if test="text_type=='sys_trans_id'">
+                    and t.system_transaction_id =#{search_text}
+                </if>
+                <if test="text_type=='channel'">
+                    and o.channel = #{search_text}
+                </if>
+                <if test="text_type=='remark'">
+                    and o.order_detail like #{name_pattern}
+                </if>
+                <if test="text_type=='order_id'">
+                    and t.order_id = #{search_text}
+                </if>
+                <if test="text_type=='client_order_id'">
+                    and o.client_order_id = #{search_text}
+                </if>
+            </if>
             <if test="!hide_sub_mch and client_ids!=null">
                 AND t.client_id IN
                 <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
@@ -231,6 +255,30 @@
         left JOIN pmt_orders o on o.order_id=t.order_id
         LEFT JOIN sys_clients c on c.client_id = t.client_id
         <where>
+            <if test="search_text!=null">
+                <bind name="name_pattern" value="'%'+search_text+'%'"/>
+                <if test="text_type=='all'">
+                    and (o.order_detail like
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
+                    t.order_id = #{name_pattern}
+                    or o.client_order_id = #{name_pattern})
+                </if>
+                <if test="text_type=='sys_trans_id'">
+                    and t.system_transaction_id =#{search_text}
+                </if>
+                <if test="text_type=='channel'">
+                    and o.channel = #{search_text}
+                </if>
+                <if test="text_type=='remark'">
+                    and o.order_detail like #{name_pattern}
+                </if>
+                <if test="text_type=='order_id'">
+                    and t.order_id = #{search_text}
+                </if>
+                <if test="text_type=='client_order_id'">
+                    and o.client_order_id = #{search_text}
+                </if>
+            </if>
             <if test="client_ids!=null">
                 AND t.client_id IN
                 <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">

src/main/ui/static/payment/tradelog/templates/balance_report.html

@@ -53,6 +53,23 @@
                         <div class="row">
                             <div class="col-sm-12">
                                 <div class="form-horizontal">
+                                    <div class="form-group col-xs-12">
+                                        <label class="col-xs-4 col-sm-2">
+                                            <select class="form-control" ng-model="params.textType">
+                                                <option value="all">ALL</option>
+                                                <option value="client_order_id">Client Order ID</option>
+                                                <option value="sys_trans_id">Platform Transaction ID</option>
+                                                <option value="channel">Channel</option>
+                                                <option value="remark">Order Detail</option>
+                                                <option value="order_id">Order ID</option>
+                                            </select>
+                                        </label>
+                                        <div class="col-sm-4 col-xs-8">
+                                            <input class="form-control" placeholder="Keyword"
+                                                   ng-enter="loadTradeLogs(1)"
+                                                   ng-model="params.searchText">
+                                        </div>
+                                    </div>
                                     <div class="form-group col-xs-12">
                                         <label class="control-label col-xs-4 col-sm-2">Transaction Type</label>
                                         <div class="col-sm-10 col-xs-8">

src/main/ui/static/payment/tradelog/transflow.js

@@ -13,7 +13,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         })
     }]);
     app.controller('balanceListCtrl', ['$scope', '$http', '$filter', '$timeout', 'refunder', 'orderService','$sce', function ($scope, $http, $filter, $timeout, refunder,orderService,$sce) {
-        $scope.params = {};
+        $scope.params = {textType: 'all'};
         $scope.pagination = {};
         $scope.params.clearing_status = -1;
         $scope.params.channel = 'ALL'