画布待完成会员列表调整：店长展示本店，导购展示本人

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

@@ -50,6 +50,9 @@ public class CanvasDataController {
         setPageParam(jsonObject, null, null);
         //1画布维度2导购维度3会员维度
         jsonObject.put("dataType", 1);
+
+        removeClerkIdParam(qo.getClerkId(), jsonObject);
+
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_list");
         List<CanvasConversionDataVO> list = DataApiUtils.parsePageDataList(res, CanvasConversionDataVO.class);
         return RestResponse.successResult(list.size() > 0 ? list.get(0) : new CanvasConversionDataVO());
@@ -64,6 +67,9 @@ public class CanvasDataController {
     public RestResponse<Page<CanvasToDoCompleteMemberVO>> getCanvasToDoCompleteMember(@RequestBody CanvasToDoCompleteMemberQO qo) {
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
         setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
+
+        removeClerkIdParam(qo.getClerkId(), jsonObject);
+
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mbr");
 
         Page<CanvasToDoCompleteMemberVO> page = DataApiUtils.getPageData(res, CanvasToDoCompleteMemberVO.class);
@@ -73,6 +79,13 @@ public class CanvasDataController {
         return RestResponse.successResult(page);
     }
 
+    private void removeClerkIdParam(String clerkId, JSONObject jsonObject) {
+        if (StringUtils.isNotBlank(clerkId) && staffApiService.isManager(clerkId)) {
+            //店长不需要传参
+            jsonObject.remove("clerkId");
+        }
+    }
+
     /**
      * 活动已完成的会员
      * @param qo
@@ -84,6 +97,9 @@ public class CanvasDataController {
         setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
         //1导购2会员
         jsonObject.put("dataType", 2);
+
+        removeClerkIdParam(qo.getClerkId(), jsonObject);
+
         Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_clerk");
 
         Page<CanvasConversionMemberVO> page = DataApiUtils.getPageData(res, CanvasConversionMemberVO.class);

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

@@ -22,4 +22,8 @@ public class CanvasConversionDataQO implements Serializable {
      * mass:群发任务 tel_task：话务任务
      */
     private String subType;
+
+    private String storeId;
+
+    private String clerkId;
 }

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

@@ -18,4 +18,8 @@ public class CanvasToDoCompleteMemberQO extends PageQo implements Serializable {
      * mass:群发任务 tel_task：话务任务
      */
     private String subType;
+
+    private String storeId;
+
+    private String clerkId;
 }