活动导购详情

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.DataApiUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.web.qo.canvas.CanvasConversionClerkQO;
 import com.gic.haoban.manage.web.qo.canvas.CanvasConversionDataQO;
 import com.gic.haoban.manage.web.qo.canvas.CanvasConversionMemberQO;
 import com.gic.haoban.manage.web.utils.EsMemberInfoUtils;
@@ -66,11 +67,29 @@ public class CanvasDataController {
         return RestResponse.successResult(page);
     }
 
+    /**
+     * 活动导购详情
+     * @param qo
+     * @return
+     */
+    @RequestMapping("get-canvas-conversion-clerk")
+    public RestResponse<Page<CanvasConversionMemberVO>> getCanvasConversionClerk(@RequestBody CanvasConversionClerkQO qo) {
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
+        setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
+        //1导购2会员
+        jsonObject.put("dataType", 1);
+        Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_clerk");
+
+        Page<CanvasConversionMemberVO> page = DataApiUtils.getPageData(res, CanvasConversionMemberVO.class);
+        List<CanvasConversionMemberVO> list = page.getResult();
+        esMemberInfoUtils.setMemberInfo(qo.getEnterpriseId(), list, Stream.of("clerkCode", "clerkName")
+                .collect(Collectors.toSet()));
+        return RestResponse.successResult(page);
+    }
+
     private void setPageParam(JSONObject jsonObject, Integer pageNum, Integer pageSize) {
         jsonObject.put("pageNum", pageNum == null ? 1 : pageNum);
         jsonObject.put("pageSize", pageSize == null ? 10 : pageSize);
-        //1画布维度2导购维度3会员维度
-        jsonObject.put("dataType", 1);
     }
 
 }

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

+package com.gic.haoban.manage.web.qo.canvas;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CanvasConversionClerkQO extends CanvasConversionDataQO implements Serializable {
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    /**
+     * 1 升序 2降序
+     */
+    private Integer orderByType;
+
+    /**
+     * 1金额/积分 2人数
+     */
+    private String orderByFields;
+}