Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/vo/api/advert/ApiAdvertDataVo.java

@@ -27,6 +27,8 @@ public class ApiAdvertDataVo implements Serializable {
     private String createTime;
 
     private String viewType;
+    private String advertType ;
+    private String pageUrl ;
 
 
     public String getAdvertId() {
@@ -196,4 +198,20 @@ public class ApiAdvertDataVo implements Serializable {
     public void setViewType(String viewType) {
         this.viewType = viewType;
     }
+
+    public String getAdvertType() {
+        return advertType;
+    }
+
+    public void setAdvertType(String advertType) {
+        this.advertType = advertType;
+    }
+
+    public String getPageUrl() {
+        return pageUrl;
+    }
+
+    public void setPageUrl(String pageUrl) {
+        this.pageUrl = pageUrl;
+    }
 }

service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java

@@ -50,6 +50,8 @@ public abstract class AbstractAdvertBusinessServiceDataFlowListener extends Abst
         businessAdvertInfo.put("locationObjId", businessAdvertInfo.get("location_obj_id"));
         businessAdvertInfo.put("seq", businessAdvertInfo.get("seq"));
         businessAdvertInfo.put("viewType", businessAdvertInfo.get("view_type"));
+        businessAdvertInfo.put("advertType", businessAdvertInfo.get("advert_type"));
+        businessAdvertInfo.put("pageUrl", businessAdvertInfo.get("page_url"));
         businessAdvertInfo.remove("bId");
         businessAdvertInfo.put("statusCd", statusCd);
     }
@@ -88,6 +90,9 @@ public abstract class AbstractAdvertBusinessServiceDataFlowListener extends Abst
         currentAdvertInfo.put("seq", currentAdvertInfo.get("seq"));
         currentAdvertInfo.put("viewType", currentAdvertInfo.get("view_type"));
 
+        currentAdvertInfo.put("advertType", currentAdvertInfo.get("advert_type"));
+        currentAdvertInfo.put("pageUrl", currentAdvertInfo.get("page_url"));
+
 
         currentAdvertInfo.put("operate", StatusConstant.OPERATE_DEL);
         getAdvertServiceDaoImpl().saveBusinessAdvertInfo(currentAdvertInfo);