营销活动拉取修改

house365-hgs-web/src/main/java/com/house365/web/controller/MarketingActivityController.java

@@ -680,19 +680,11 @@ public class MarketingActivityController extends BaseController {
             wrapMap(entity, paraMap);
 
             MarketingActivityRequest marketingActivityRequest = new MarketingActivityRequest();
-            String[] projectNames = vo.getProjectName().split(",");
-            StringBuilder name = new StringBuilder();
-            for (int j = 0; j < projectNames.length; j++) {
-                name.append(projectNames[j].split("\\(")[0]).append(",");
-            }
-            String seeProjectName = name.toString();
-            if (seeProjectName.contains(",")) {
-                seeProjectName = seeProjectName.substring(0, seeProjectName.length() - 1);
-            }
-            entity.setSeeProjectName(seeProjectName);
-            entity.setSeeCount(vo.getSeeCount());
-            entity.setSeeStartTime(vo.getSeeStartTime());
-            entity.setSeeEndTime(vo.getSeeEndTime());
+
+            entity.setSeeProjectName("");
+            entity.setSeeCount(0);
+            entity.setSeeStartTime(null);
+            entity.setSeeEndTime(null);
             if (!StringUtils.isEmpty(vo.getActivityName())) {
                 entity.setName(vo.getActivityName());
             }

house365-hgs-web/src/main/resources/development/properties/system.properties

@@ -26,8 +26,8 @@ system.default.fileMax=2097152
 projects.server.url=http://oms.house365.com/test/adminpack/index.php
 ##  News
 news.server.url=http://mapi.house365.com/cms/mobile_news.php
-CRM.CUSTOMERQUERY.URL=http://crmtest.house365.com/api/hgs/query
-#CRM.CUSTOMERQUERY.URL=http://crm.house365.com/api/hgs/query
+#CRM.CUSTOMERQUERY.URL=http://crmtest.house365.com/api/hgs/query
+CRM.CUSTOMERQUERY.URL=http://crm.house365.com/api/hgs/query
 #CRM.TRANSLATE.URL=http://crmtest.house365.com/api/hgs/translate
 CRM.TRANSLATE.URL=http://crm.house365.com/api/hgs/translate
 

house365-hgs-ws/src/main/resources/development/properties/system.properties

@@ -39,8 +39,8 @@ CRM.TOUCH.HOST=http://crmtouch.house365.com
 CRM.CUSTOMER.CALLBACK=http://tcrm.house365.com/api/hgs/pingback
 unbindcornet.url=http://api.400.house365.com/api/5a9ea13f5e42c
 CRM.CONFIG.URL=http://tcrm.house365.com/api/hgs/definition
-CRM.CUSTOMERQUERY.URL=http://crmtest.house365.com/api/hgs/query
-#CRM.CUSTOMERQUERY.URL=http://crm.house365.com/api/hgs/query
+#CRM.CUSTOMERQUERY.URL=http://crmtest.house365.com/api/hgs/query
+CRM.CUSTOMERQUERY.URL=http://crm.house365.com/api/hgs/query
 
 CRM.CONFIRM.URL=http://crmtest.house365.com/api/hgs/confirm
 #\u7EA6\u770B\u63D0\u9192#