Merge branch 'feature-929-1' into 'master'

标签导入

See merge request !127

haoban-manage3-operation-web/pom.xml

@@ -230,6 +230,18 @@
 			<artifactId>haoban-app-customer-api</artifactId>
 			<version>${haoban-app-customer-api}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-member-tag-api</artifactId>
+			<version>${gic-member-tag-api}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>task-allocation-sdk</artifactId>
+			<version>${task-allocation-sdk}</version>
+		</dependency>
     </dependencies>
 
 	<build>

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -13,8 +13,11 @@ import com.gic.haoban.manage.api.service.TestApiService;
 import com.gic.haoban.manage.web.controller.WebBaseController;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.QywxTagSyncInfoQo;
+import com.gic.member.tag.api.service.MemberTagImportDealService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.sharing.core.service.api.service.MqApiService;
+import com.task.allocation.qo.AllocationTaskQo;
+import com.task.allocation.qo.TaskAllocationComputed;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,9 @@ public class TestController extends WebBaseController {
 
     @Autowired
     private DealSyncOperationApiService dealSyncOperationApiService;
+
+    @Autowired
+    private MemberTagImportDealService memberTagImportDealService;
 //
 //    @RequestMapping("/testList")
 //    @ResponseBody
@@ -191,4 +197,26 @@ public class TestController extends WebBaseController {
         }
         return resultResponse(HaoBanErrCode.ERR_1);
     }
+
+    /**
+     * 刷新单个标签同步到队列
+     *
+     * @return
+     */
+    @RequestMapping("/memberTag")
+    @ResponseBody
+    public HaobanResponse memberTag(String id, String tagId) {
+        AllocationTaskQo taskQo = new AllocationTaskQo();
+        taskQo.setType(AllocationTaskQo.COMPUTED);
+        taskQo.setTaskAllocationId(id);
+
+        TaskAllocationComputed task = new TaskAllocationComputed();
+        task.setTaskAllocationId(id);
+        task.setTaskSignKey(tagId);
+        task.setTaskStatus(TaskAllocationComputed.TASK_STATUS_SUCCESS);
+        taskQo.setParams(JSONObject.toJSONString(task));
+
+        memberTagImportDealService.run(JSONObject.toJSONString(taskQo));
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 }

haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml

@@ -60,4 +60,7 @@
 	<dubbo:reference interface="com.gic.haoban.app.customer.service.api.service.QywxTagSyncApiService"
 					 id="qywxTagSyncApiService"/>
 
+	<dubbo:reference interface="com.gic.member.tag.api.service.MemberTagImportDealService"
+					 id="memberTagImportDealService"/>
+
 </beans>