From 31f916706e20150fa40e87939cb6a58d13a8dfdc Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Thu, 30 Dec 2021 16:11:46 +0800
Subject: [PATCH 1/4] fix: settlement detailed transactions

---
 .../payment/manage/mappers/payment/TransactionMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 478df93b9..1b16e7289 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -1252,7 +1252,7 @@
         FROM pmt_transactions t
                  LEFT JOIN pmt_orders o ON o.order_id = t.order_id
                  LEFT JOIN pmt_refunds r ON r.refund_id = t.refund_id
-                 LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id
+                 LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id and sci.channel = o.source and sci.is_valid = 1
                  INNER JOIN log_clearing_detail lcd ON t.clearing_order = lcd.clear_detail_id
         WHERE t.channel != 'Settlement'
           AND t.clearing_order = #{clearing_order}

From 08daf88d135569928dfb1784b0152648f1d3f76c Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Tue, 4 Jan 2022 14:05:46 +0800
Subject: [PATCH 2/4] 2.3.4: upgrade parent; deploy configs

---
 pom.xml | 40 +++-------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a69e6e4e..f5ff5b9ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.3.3</version>
+        <version>2.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
@@ -15,6 +15,7 @@
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
         <yixsoft-batis.version>1.0.12</yixsoft-batis.version>
         <mysql.version>8.0.20</mysql.version>
+        <image.version>${project.version}</image.version>
     </properties>
 
     <dependencies>
@@ -294,41 +295,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>dev</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.google.cloud.tools</groupId>
-                        <artifactId>jib-maven-plugin</artifactId>
-                        <version>${jib-maven-plugin.version}</version>
-                        <configuration>
-                            <from>
-                                <image>192.168.0.84:5000/royalpay/openjdk:11.0.8</image>
-                            </from>
-                            <to>
-                                <image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${project.version}
-                                </image>
-                            </to>
-                            <extraDirectories>
-                                <paths>
-                                    <path>extra/</path>
-                                </paths>
-                            </extraDirectories>
-                            <allowInsecureRegistries>true</allowInsecureRegistries>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>prod</id>
             <build>
@@ -342,7 +308,7 @@
                                 <image>192.168.0.84:5000/royalpay/openjdk:11.0.8</image>
                             </from>
                             <to>
-                                <image>hkccr.ccs.tencentyun.com/rpay/manage:${project.version}</image>
+                                <image>hkccr.ccs.tencentyun.com/rpay/manage:${image.version}</image>
                             </to>
                             <extraDirectories>
                                 <paths>

From 2981df4d317858782e1636a4be6cf1bff3b87dda Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Tue, 4 Jan 2022 14:07:12 +0800
Subject: [PATCH 3/4] 2.4.4: version update

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f5ff5b9ad..126162ca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.4</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

From 30ef9579a2ed1bcc2f31e009f1c1447592bba116 Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Wed, 5 Jan 2022 16:55:50 +0800
Subject: [PATCH 4/4] permission display

---
 .../ui/static/rservicesapply/templates/r-services-apply.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/rservicesapply/templates/r-services-apply.html b/src/main/ui/static/rservicesapply/templates/r-services-apply.html
index 0e7538f23..0788ac2a1 100644
--- a/src/main/ui/static/rservicesapply/templates/r-services-apply.html
+++ b/src/main/ui/static/rservicesapply/templates/r-services-apply.html
@@ -110,7 +110,7 @@
                     </td>
                     <td ng-bind="apply.apply_username"></td>
                     <td ng-bind="apply.create_time|date:'dd/MMM/yyyy'"></td>
-                    <td ng-if="apply.status==0 && ('01'|withRole)"><a class="text-primary" role="button" title="PASS" style="color:green" ng-click="passApply(apply)">
+                    <td ng-if="apply.status==0 && ('10'|withRole)"><a class="text-primary" role="button" title="PASS" style="color:green" ng-click="passApply(apply)">
                         <i class="fa fa-check"></i> PASS
                     </a>|
                         <a class="text-primary" role="button" title="REFUSE" style="color: red" ng-click="refuseApply(apply)">