fix geek act

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.60</version>
+    <version>1.3.61</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/impls/RetailAppServiceImp.java

@@ -1588,18 +1588,21 @@ public class RetailAppServiceImp implements RetailAppService {
             latestAct.put("url", latestAct.getString("act_url"));
             latestAct.put("title", latestAct.getString("act_name"));
             latestAct.put("img", latestAct.getString("act_img"));
-            latestAct.remove("act_id");
-            latestAct.remove("act_name");
-            latestAct.remove("act_url");
             JSONObject act = new JSONObject();
             act.put("data", latestAct);
             act.put("type", "popup");
             if (StringUtils.equalsIgnoreCase("跨境商城", latestAct.getString("act_name"))) {
                 if (clientConfig !=null && !clientConfig.getBooleanValue("geek_shop_status")
                         && geekShowActVersion(device.getString("version"))) {
+                    latestAct.remove("act_id");
+                    latestAct.remove("act_name");
+                    latestAct.remove("act_url");
                     result.add(act);
                 }
             }else {
+                latestAct.remove("act_id");
+                latestAct.remove("act_name");
+                latestAct.remove("act_url");
                 result.add(act);
             }
         }

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

@@ -482,11 +482,6 @@ public class RetailAppController {
         return appActService.listAppActs();
     }
 
-    @GetMapping("/popup_acts")
-    public JSONObject getAppActPopup(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
-        return appActService.getAppActPopup();
-    }
-
     @GetMapping("/act/mondelay/desc")
     public ModelAndView getActDetail(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
         ModelAndView mav = new ModelAndView("activity/mondelay/mondelay");