|
|
|
@ -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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|