fix getAppActPopup

pom.xml

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

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

@@ -1578,17 +1578,14 @@ public class RetailAppServiceImp implements RetailAppService {
         confirmNotice.put("type", "confirm_notice");
         result.add(confirmNotice);
 
-        JSONObject latestAct = appActService.getLatestWindowNotice();
+        JSONObject latestAct = appActService.getAppActPopup();
         if (latestAct != null) {
             latestAct.put("id", latestAct.getString("act_id"));
-            if (latestAct.getIntValue("show_type") == 0) {
+            latestAct.put("url", latestAct.getString("act_url"));
-                latestAct.put("url", latestAct.getString("act_url"));
-            }
             latestAct.put("title", latestAct.getString("act_name"));
-            latestAct.put("img", latestAct.getString("window_img"));
+            latestAct.put("img", latestAct.getString("act_img"));
             latestAct.remove("act_id");
             latestAct.remove("act_name");
-            latestAct.remove("window_img");
             latestAct.remove("act_url");
             JSONObject act = new JSONObject();
             act.put("data", latestAct);