fix getAppActPopup

master
luoyang 5 years ago
parent a8afc43437
commit defd9df6f4

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

@ -1578,17 +1578,14 @@ public class RetailAppServiceImp implements RetailAppService {
confirmNotice.put("type", "confirm_notice"); confirmNotice.put("type", "confirm_notice");
result.add(confirmNotice); result.add(confirmNotice);
JSONObject latestAct = appActService.getLatestWindowNotice(); JSONObject latestAct = appActService.getAppActPopup();
if (latestAct != null) { if (latestAct != null) {
latestAct.put("id", latestAct.getString("act_id")); 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("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_id");
latestAct.remove("act_name"); latestAct.remove("act_name");
latestAct.remove("window_img");
latestAct.remove("act_url"); latestAct.remove("act_url");
JSONObject act = new JSONObject(); JSONObject act = new JSONObject();
act.put("data", latestAct); act.put("data", latestAct);

Loading…
Cancel
Save