From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java b/service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java
index 7a3351c..cb3aaf9 100755
--- a/service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java
+++ b/service-common/src/main/java/com/java110/common/listener/advert/AbstractAdvertBusinessServiceDataFlowListener.java
@@ -50,6 +50,8 @@
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 @@
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);
--
Gitblit v1.8.0