Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2381

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/CanvasDataController.java

@@ -147,7 +147,7 @@ public class CanvasDataController {
     }
 
     /**
-     * 店长 任务列表
+     * 店长/店员 任务列表
      * @param qo
      * @return
      */
@@ -157,10 +157,10 @@ public class CanvasDataController {
         setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
         jsonObject.put("subType", "all");
 
-        if (StringUtils.isNotBlank(qo.getClerkId()) && staffApiService.isManager(qo.getClerkId())) {
-            //店长不需要传参
-            jsonObject.remove("clerkId");
-        }
+//        if (StringUtils.isNotBlank(qo.getClerkId()) && staffApiService.isManager(qo.getClerkId())) {
+//            //店长不需要传参
+//            jsonObject.remove("clerkId");
+//        }
 
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mkt_task");
         Page<CanvasStoreTaskVO> page = DataApiUtils.getPageData(res, CanvasStoreTaskVO.class);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/canvas/CanvasStoreTaskQO.java

@@ -47,7 +47,7 @@ public class CanvasStoreTaskQO extends PageQo implements Serializable {
     private String storeId;
 
     /**
-     * 普通导购
+     * 不传则查询整个门店
      */
     private String clerkId;
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/canvas/CanvasStoreTaskVO.java

@@ -55,6 +55,11 @@ public class CanvasStoreTaskVO implements Serializable {
 
     private String clerkId;
 
+  /**
+   * 导购头像
+   */
+   private String clerkImageUrl;
+
 
     /**
      * 画布活动名称
@@ -65,4 +70,9 @@ public class CanvasStoreTaskVO implements Serializable {
      * 活动ID
      */
     private String canvasId;
+
+    /**
+     * 排序值
+     */
+    private Integer rn;
 }