Merge branch 'feature/xgh/导购任务' into 'developer'

导购任务

See merge request !2149

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -269,7 +269,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 NoticeMessageUtil.sendNoticeMessageByStaff(enterpriseId,related.getStaffId(),related.getClerkId(),messageType,related.getMemberId(),map,jsonObject);
             }
         }
-        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
+        addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0,null,false);
     }
     
     @Override
@@ -791,7 +791,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         this.memberApiService.updateMemberQywxEveryOccasion(enterpriseId, memberId, 1, date,firstTime);
         //定制事件订阅
-        addDelFriendEvent(unionId, clerkId, wxEnterpriseId, enterpriseId, memberId, storeId, 1);
+        addDelFriendEvent(unionId, clerkId, wxEnterpriseId, enterpriseId, memberId, storeId, 1 , externalUserid,true);
         return memberId;
     }
     private void saveExternalClerk(String memberId ,String staffId , MemberUnionidRelatedDTO dto , StaffClerkRelationDTO staffClerkRelation , int status) {
@@ -866,7 +866,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     /**
      * 欧泊莱定制需求
      */
-    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType) {
+    private void addDelFriendEvent(String unionId, String clerkId, String wxEnterpriseId, String enterpriseId, String memberId, String storeId, Integer changeType , String externalUserid , boolean isNewMember) {
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         if(changeType==1) {
             log.info("加好友通知={}",memberId);
@@ -874,6 +874,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             json.put("enterpriseId",enterpriseId) ;
             json.put("clerkId",clerkId) ;
             json.put("memberId",memberId) ;
+            json.put("externalUserid",externalUserid) ;
+            json.put("isNewMember",isNewMember) ;
             try {
                 clientInstance.sendMessage("qywxAddFriendEvent", json.toJSONString());
             } catch (Exception e) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/clerktask/ClerkTaskController.java

+package com.gic.haoban.manage.web.controller.clerktask;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.web.qo.clerktask.*;
+import com.gic.haoban.manage.web.vo.clerktask.*;
+import com.gic.marketing.pro.api.dto.clerktask.*;
+import com.gic.marketing.pro.api.qdto.clerktask.ClerkAwardQDTO;
+import com.gic.marketing.pro.api.qdto.clerktask.ClerkRankQDTO;
+import com.gic.marketing.pro.api.qdto.clerktask.ClerkTaskContentPageQDTO;
+import com.gic.marketing.pro.api.qdto.clerktask.ClerkTaskPageQDTO;
+import com.gic.marketing.pro.api.service.clerktask.ClerkTaskApiService;
+import com.gic.web.common.utils.SessionContextUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 导购任务-好办小程序
+ */
+
+@Controller
+@RequestMapping("clerk/task")
+public class ClerkTaskController {
+
+    @Autowired
+    private ClerkTaskApiService clerkTaskApiService ;
+
+    /**
+     * 导购进行中任务数
+     */
+    @RequestMapping("get-task-count")
+    @ResponseBody
+    public RestResponse<Object> getTaskCount(String enterpriseId , String clerkId) {
+        ClerkTaskPageQDTO qdto = new ClerkTaskPageQDTO() ;
+        qdto.setStatus(2);
+        qdto.setClerkId(clerkId);
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setPageNum(1);
+        qdto.setPageSize(1);
+        ServiceResponse<Page<ClerkTaskPlanDTO>> resp =this.clerkTaskApiService.page(qdto) ;
+        if(null != resp.getResult()) {
+            return RestResponse.successResult(resp.getResult().getTotalCount()) ;
+        }
+        return RestResponse.successResult(0) ;
+    }
+
+    /**
+     * 导购任务列表
+     * @return
+     */
+    @RequestMapping("task-list")
+    @ResponseBody
+    public RestResponse<Page<ClerkTaskListVO>> taskList(@RequestBody ClerkTaskListQO qo) {
+        ClerkTaskPageQDTO qdto = EntityUtil.changeEntityByJSON(ClerkTaskPageQDTO.class,qo) ;
+        ServiceResponse<Page<ClerkTaskPlanDTO>> resp =this.clerkTaskApiService.page(qdto) ;
+        Page<ClerkTaskPlanDTO> page = resp.getResult();
+        Page<ClerkTaskListVO> retPage = PageHelperUtils.changePageToCurrentPage(page, ClerkTaskListVO.class);
+        if(CollectionUtils.isNotEmpty(retPage.getResult())) {
+            Map<Long,Integer> map = this.statusMap(page.getResult()) ;
+            for(ClerkTaskListVO vo : retPage.getResult()) {
+                vo.setStatus(map.get(vo.getPlanId()));
+            }
+        }
+        return RestResponse.successResult(retPage) ;
+    }
+
+    // 1未开始  2进行中  3已结束  4已过期 */
+    private Map<Long,Integer> statusMap(List<ClerkTaskPlanDTO> list) {
+        Map<Long,Integer> map = new HashMap<>() ;
+        for(ClerkTaskPlanDTO dto : list) {
+            if(dto.getStatusFlag()==2) {
+                map.put(dto.getPlanId(),3) ;
+            }else {
+                if(dto.getBeginDate().getTime()>System.currentTimeMillis()) {
+                    map.put(dto.getPlanId(),1) ;
+                }else if(DateUtil.getEndTimeOfDay(dto.getEndDate()).getTime()<System.currentTimeMillis()) {
+                    map.put(dto.getPlanId(),3) ;
+                }else {
+                    map.put(dto.getPlanId(),2) ;
+                }
+            }
+        }
+        return map ;
+    }
+
+    /**
+     * 任务详情
+     */
+    @RequestMapping("task-detail")
+    @ResponseBody
+    public RestResponse<TaskPlanDetailVO> taskDetail(Long planId , String clerkId) {
+        TaskPlanDetailVO vo = new TaskPlanDetailVO() ;
+        this.clerkTaskApiService.getDetail(planId) ;
+        return RestResponse.successResult(vo) ;
+    }
+
+    /**
+     * 排名
+     */
+    @RequestMapping("task-rank-list")
+    @ResponseBody
+    public RestResponse<Page<ClerkRankVO>> taskRankList(@RequestBody ClerkRankQO qo) {
+        ClerkRankQDTO qdto = EntityUtil.changeEntityByJSON(ClerkRankQDTO.class,qo) ;
+        ServiceResponse<Page<ClerkRankDTO>> resp = this.clerkTaskApiService.taskRankList(qdto) ;
+        Page<ClerkRankDTO> page = resp.getResult();
+        Page<ClerkRankVO> retPage = PageHelperUtils.changePageToCurrentPage(page, ClerkRankVO.class);
+        return RestResponse.successResult(retPage) ;
+    }
+
+    /**
+     * 奖励明细
+     */
+    @RequestMapping("task-award-list")
+    @ResponseBody
+    public RestResponse<Page<ClerkAwardVO>> taskAwardList(@RequestBody ClerkAwardQO qo) {
+        ClerkAwardQDTO qdto = EntityUtil.changeEntityByJSON(ClerkAwardQDTO.class,qo) ;
+        ServiceResponse<Page<ClerkTaskAwardLogDTO>> resp = this.clerkTaskApiService.taskAwardList(qdto) ;
+        Page<ClerkTaskAwardLogDTO> page = resp.getResult();
+        Page<ClerkAwardVO> retPage = PageHelperUtils.changePageToCurrentPage(page, ClerkAwardVO.class);
+        return RestResponse.successResult(retPage) ;
+    }
+    /**
+     *  公域-内容创作上报
+     */
+    @RequestMapping("save-content")
+    @ResponseBody
+    public RestResponse<String> saveContent(@RequestBody SaveContentQO qo) {
+        ClerkTaskContentLogDTO dto = EntityUtil.changeEntityByJSON(ClerkTaskContentLogDTO.class,qo) ;
+        ServiceResponse<Long> resp = this.clerkTaskApiService.saveContent(dto) ;
+        return RestResponse.successResult(resp.getResult()+"") ;
+    }
+
+    /**
+     *  公域-内容创作上报-更新
+     */
+    @RequestMapping("update-content")
+    @ResponseBody
+    public RestResponse<String> updateContent(@RequestBody SaveContentQO qo) {
+        ClerkTaskContentLogDTO dto = EntityUtil.changeEntityByJSON(ClerkTaskContentLogDTO.class,qo) ;
+        ServiceResponse<Long> resp = this.clerkTaskApiService.saveContent(dto) ;
+        return RestResponse.successResult(resp.getResult()+"") ;
+    }
+
+    /**
+     * 公域-素材列表查询
+     * @param qo
+     * @return
+     */
+    @RequestMapping("list-content")
+    @ResponseBody
+    public RestResponse<Page<ClerkTaskContentPageVO>> listContent(@RequestBody ContentPageQO qo) {
+        ClerkTaskContentPageQDTO qdto = EntityUtil.changeEntityByJSON(ClerkTaskContentPageQDTO.class,qo) ;
+        ServiceResponse<Page<ClerkTaskContentLogDTO>> resp = this.clerkTaskApiService.contentPage(qdto) ;
+        Page<ClerkTaskContentLogDTO> page = resp.getResult();
+        Page<ClerkTaskContentPageVO> retPage = PageHelperUtils.changePageToCurrentPage(page, ClerkTaskContentPageVO.class);
+        return RestResponse.successResult(retPage) ;
+    }
+
+    /**
+     *  获取召回客户数
+     */
+    @RequestMapping("get-consume-count")
+    @ResponseBody
+    public RestResponse<ConsumeMemberCountVO> getConsumeCount(String enterpriseId , String clerkId , Long planId) {
+        ConsumeMemberCountDTO dto = this.clerkTaskApiService.getConsumeCount(enterpriseId,clerkId,planId) ;
+        ConsumeMemberCountVO vo = EntityUtil.changeEntityByJSON(ConsumeMemberCountVO.class,dto) ;
+        return RestResponse.successResult(vo) ;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentCreativeController.java

@@ -23,6 +23,8 @@ import com.gic.haoban.manage.web.qo.content.ContentMaterialSaveQO;
 import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialConvsVO;
 import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialDataVO;
 import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialVO;
+import com.gic.marketing.pro.api.dto.clerktask.ClerkTaskContentLogDTO;
+import com.gic.marketing.pro.api.service.clerktask.ClerkTaskApiService;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -56,6 +58,8 @@ public class ContentCreativeController {
     private ClerkStoreAdaptor clerkStoreAdaptor;
     @Autowired
     private MaterialDataAdaptor materialDataAdaptor;
+    @Autowired
+    private ClerkTaskApiService clerkTaskApiService ;
 
     /**
      * 创建素材
@@ -100,6 +104,17 @@ public class ContentCreativeController {
         if (!response.isSuccess()) {
             return RestResponse.failure(response.getCode(), response.getMessage());
         }
+        Long clerkTaskPlanId = saveQO.getClerkTaskPlanId() ;
+        if(null != clerkTaskPlanId) {
+            ClerkTaskContentLogDTO dto = new ClerkTaskContentLogDTO() ;
+            dto.setPlanId(clerkTaskPlanId);
+            dto.setRelationId(response.getResult().getContentMaterialId());
+            dto.setEnterpriseId(saveQO.getEnterpriseId());
+            dto.setContentPublishType(1);
+            dto.setStatusFlag(0);
+            dto.setClerkId(clerkId);
+            this.clerkTaskApiService.saveContent(dto) ;
+        }
         return RestResponse.successResult(response.getResult());
     }
 
@@ -178,6 +193,16 @@ public class ContentCreativeController {
             filterMaterialIdList = result.stream().map(ContentMaterialConvsVO::getContentMaterialId).collect(Collectors.toList());
             totalCount = dataPage.getTotalCount();
         }
+
+        if(null != auditMaterialQO.getClerkTaskPlanId()) {
+            List<Long> materiaIdList = this.clerkTaskApiService.listContentMaterialIdList(auditMaterialQO.getClerkTaskPlanId(),auditMaterialQO.getClerkId()) ;
+            if(CollectionUtils.isEmpty(materiaIdList)) {
+                return RestResponse.successResult(new Page<>());
+            }
+            filterMaterialIdList = materiaIdList ;
+            log.info("导购任务id={},{}",auditMaterialQO.getClerkTaskPlanId(),filterMaterialIdList);
+        }
+
         pageQDTO.setContentMaterialIdList(filterMaterialIdList);
         ServiceResponse<Page<ContentMaterialDTO>> response = contentMaterialApiService.pageMaterial(pageQDTO, auditMaterialQO.getBasePageInfo());
         if (!response.isSuccess() || CollectionUtils.isEmpty(response.getResult().getResult())) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/clerktask/ClerkAwardQO.java

+package com.gic.haoban.manage.web.qo.clerktask;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+
+/**
+ * 导购奖励信息查询
+ */
+public class ClerkAwardQO extends BasePageInfo implements Serializable {
+
+    private String clerkId ;
+
+    private Long planId ;
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/clerktask/ClerkRankQO.java

+package com.gic.haoban.manage.web.qo.clerktask;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+
+/**
+ * 导购排名
+ */
+public class ClerkRankQO extends BasePageInfo implements Serializable {
+
+    private String clerkId ;
+
+    /**
+     * 计划ID
+     */
+    private Long planId ;
+
+    private String enterpriseId ;
+
+    // 0创作/召回数/好友数 1播放 2互动 3涨粉
+    private int randType = 0 ;
+
+    // 0内容单篇 1内容达标
+    private int contentType = 0 ;
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public int getRandType() {
+        return randType;
+    }
+
+    public void setRandType(int randType) {
+        this.randType = randType;
+    }
+
+    public int getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(int contentType) {
+        this.contentType = contentType;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/clerktask/ClerkTaskListQO.java

+package com.gic.haoban.manage.web.qo.clerktask;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+
+public class ClerkTaskListQO extends BasePageInfo implements Serializable {
+
+    // 1未开始  2进行中  3已结束  4已过期
+    private int status ;
+
+    /**
+     * 任务名称/id
+     */
+    private String searchParams ;
+
+    /**
+     * 导购ID
+     */
+    private String clerkId ;
+    /**
+     * 企业ID
+     */
+    private String enterpriseId ;
+
+    /**
+     * 0全部 1召回 2企微 3内容
+     */
+    private Integer taskType ;
+
+    public int getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(int taskType) {
+        this.taskType = taskType;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getSearchParams() {
+        return searchParams;
+    }
+
+    public void setSearchParams(String searchParams) {
+        this.searchParams = searchParams;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/clerktask/ContentPageQO.java

+package com.gic.haoban.manage.web.qo.clerktask;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+
+public class ContentPageQO extends BasePageInfo implements Serializable {
+
+    private Long planId ;
+    private String clerkId ;
+    private String enterpriseId ;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/clerktask/SaveContentQO.java

+package com.gic.haoban.manage.web.qo.clerktask;
+
+import java.io.Serializable;
+
+public class SaveContentQO implements Serializable {
+
+    /**
+     * id
+     */
+    private Long contentLogId ;
+
+    /**
+     * 上报类型1截图2内容链接
+     */
+    private int upType ;
+
+    /**
+     * 上报内容
+     */
+    private String content ;
+
+    /**
+     * 导购
+     */
+    private String clerkId ;
+
+    /**
+     * 计划ID
+     */
+    private Long planId ;
+
+    public Long getContentLogId() {
+        return contentLogId;
+    }
+
+    public void setContentLogId(Long contentLogId) {
+        this.contentLogId = contentLogId;
+    }
+
+    public int getUpType() {
+        return upType;
+    }
+
+    public void setUpType(int upType) {
+        this.upType = upType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentAuditMaterialQO.java

@@ -24,6 +24,19 @@ public class ContentAuditMaterialQO extends PageQo {
      */
     private Integer convsFlag;
 
+    /**
+     * 导购任务计划id
+     */
+    private Long clerkTaskPlanId ;
+
+    public Long getClerkTaskPlanId() {
+        return clerkTaskPlanId;
+    }
+
+    public void setClerkTaskPlanId(Long clerkTaskPlanId) {
+        this.clerkTaskPlanId = clerkTaskPlanId;
+    }
+
     public String getEnterpriseId() {
         return enterpriseId;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialSaveQO.java

@@ -106,6 +106,20 @@ public class ContentMaterialSaveQO {
      */
     private List<ContentMaterialRelationThirdDTO> thirdGoodsList;
 
+    /**
+     * 导购任务计划ID
+     */
+    private Long clerkTaskPlanId ;
+
+
+    public Long getClerkTaskPlanId() {
+        return clerkTaskPlanId;
+    }
+
+    public void setClerkTaskPlanId(Long clerkTaskPlanId) {
+        this.clerkTaskPlanId = clerkTaskPlanId;
+    }
+
     public Long getContentMaterialId() {
         return contentMaterialId;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ClerkAwardInfoVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import java.io.Serializable;
+
+/**
+ * 导购获取到的奖励信息
+ */
+public class ClerkAwardInfoVO implements Serializable {
+
+    /**
+     *  加好友、召回客户数
+     */
+    private int finishTaskCount ;
+
+    /**
+     * 排名 (召回、加好友）
+     */
+    private int rank ;
+
+    /**
+     * 现金（分)
+     */
+    private int cash ;
+
+    /**
+     * 礼品数
+     */
+    private int giftNum ;
+
+    /**
+     * 内容创作数
+     */
+    private int contentNum ;
+
+    /**
+     * 待审核数
+     */
+    private int contentAuditNum ;
+
+    /**
+     * 拒绝数
+     */
+    private int contentRefuseNum ;
+    /**
+     * 通过数
+     */
+    private int contentPassNum ;
+
+    /**
+     * 播放量
+     */
+    private int contentReadCount ;
+
+    /**
+     * 涨粉量
+     */
+    private int contentFollowCount ;
+
+    /**
+     * 点赞量
+     */
+    private int contentLinkCount ;
+
+    /**
+     * 收藏量
+     */
+    private int contentFavCount ;
+
+    /**
+     * 评论量
+     */
+    private int contentCommentCount ;
+
+    /**
+     * 分享量
+     */
+    private int contentForwardCount ;
+
+    /**
+     * 内容创作排名-达标
+     */
+    private int contentRank ;
+
+    /**
+     * 播放排名-达标
+     */
+    private int contentReadRank ;
+
+    /**
+     * 互动排名-达标
+     */
+    private int contentInteractRank ;
+
+    /**
+     * 涨粉排名-达标
+     */
+    private int contentFollowRank ;
+
+    /**
+     * 播放排名-单篇
+     */
+    private int contentSingleReadRank ;
+
+    /**
+     * 互动排名-单篇
+     */
+    private int contentSingleInteractRank ;
+
+    /**
+     * 涨粉排名-单篇
+     */
+    private int contentSingleFollowRank ;
+
+    public int getFinishTaskCount() {
+        return finishTaskCount;
+    }
+
+    public void setFinishTaskCount(int finishTaskCount) {
+        this.finishTaskCount = finishTaskCount;
+    }
+
+    public int getRank() {
+        return rank;
+    }
+
+    public void setRank(int rank) {
+        this.rank = rank;
+    }
+
+    public int getCash() {
+        return cash;
+    }
+
+    public void setCash(int cash) {
+        this.cash = cash;
+    }
+
+    public int getGiftNum() {
+        return giftNum;
+    }
+
+    public void setGiftNum(int giftNum) {
+        this.giftNum = giftNum;
+    }
+
+    public int getContentNum() {
+        return contentNum;
+    }
+
+    public void setContentNum(int contentNum) {
+        this.contentNum = contentNum;
+    }
+
+    public int getContentAuditNum() {
+        return contentAuditNum;
+    }
+
+    public void setContentAuditNum(int contentAuditNum) {
+        this.contentAuditNum = contentAuditNum;
+    }
+
+    public int getContentRefuseNum() {
+        return contentRefuseNum;
+    }
+
+    public void setContentRefuseNum(int contentRefuseNum) {
+        this.contentRefuseNum = contentRefuseNum;
+    }
+
+    public int getContentPassNum() {
+        return contentPassNum;
+    }
+
+    public void setContentPassNum(int contentPassNum) {
+        this.contentPassNum = contentPassNum;
+    }
+
+    public int getContentReadCount() {
+        return contentReadCount;
+    }
+
+    public void setContentReadCount(int contentReadCount) {
+        this.contentReadCount = contentReadCount;
+    }
+
+    public int getContentFollowCount() {
+        return contentFollowCount;
+    }
+
+    public void setContentFollowCount(int contentFollowCount) {
+        this.contentFollowCount = contentFollowCount;
+    }
+
+    public int getContentLinkCount() {
+        return contentLinkCount;
+    }
+
+    public void setContentLinkCount(int contentLinkCount) {
+        this.contentLinkCount = contentLinkCount;
+    }
+
+    public int getContentFavCount() {
+        return contentFavCount;
+    }
+
+    public void setContentFavCount(int contentFavCount) {
+        this.contentFavCount = contentFavCount;
+    }
+
+    public int getContentCommentCount() {
+        return contentCommentCount;
+    }
+
+    public void setContentCommentCount(int contentCommentCount) {
+        this.contentCommentCount = contentCommentCount;
+    }
+
+    public int getContentForwardCount() {
+        return contentForwardCount;
+    }
+
+    public void setContentForwardCount(int contentForwardCount) {
+        this.contentForwardCount = contentForwardCount;
+    }
+
+    public int getContentRank() {
+        return contentRank;
+    }
+
+    public void setContentRank(int contentRank) {
+        this.contentRank = contentRank;
+    }
+
+    public int getContentReadRank() {
+        return contentReadRank;
+    }
+
+    public void setContentReadRank(int contentReadRank) {
+        this.contentReadRank = contentReadRank;
+    }
+
+    public int getContentInteractRank() {
+        return contentInteractRank;
+    }
+
+    public void setContentInteractRank(int contentInteractRank) {
+        this.contentInteractRank = contentInteractRank;
+    }
+
+    public int getContentFollowRank() {
+        return contentFollowRank;
+    }
+
+    public void setContentFollowRank(int contentFollowRank) {
+        this.contentFollowRank = contentFollowRank;
+    }
+
+    public int getContentSingleReadRank() {
+        return contentSingleReadRank;
+    }
+
+    public void setContentSingleReadRank(int contentSingleReadRank) {
+        this.contentSingleReadRank = contentSingleReadRank;
+    }
+
+    public int getContentSingleInteractRank() {
+        return contentSingleInteractRank;
+    }
+
+    public void setContentSingleInteractRank(int contentSingleInteractRank) {
+        this.contentSingleInteractRank = contentSingleInteractRank;
+    }
+
+    public int getContentSingleFollowRank() {
+        return contentSingleFollowRank;
+    }
+
+    public void setContentSingleFollowRank(int contentSingleFollowRank) {
+        this.contentSingleFollowRank = contentSingleFollowRank;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ClerkAwardVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ClerkAwardVO implements Serializable {
+
+    /**时间*/
+    private java.util.Date createTime;
+    /**现金分*/
+    private int cash;
+    /**礼品[{"name":"礼品名","num":1}]*/
+    private String giftJson;
+    /**奖励说明*/
+    private String remark;
+    /**0奖励 1扣除 */
+    private int awardFlag ;
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public int getCash() {
+        return cash;
+    }
+
+    public void setCash(int cash) {
+        this.cash = cash;
+    }
+
+    public String getGiftJson() {
+        return giftJson;
+    }
+
+    public void setGiftJson(String giftJson) {
+        this.giftJson = giftJson;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public int getAwardFlag() {
+        return awardFlag;
+    }
+
+    public void setAwardFlag(int awardFlag) {
+        this.awardFlag = awardFlag;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ClerkRankVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import java.io.Serializable;
+
+public class ClerkRankVO implements Serializable {
+
+    /**
+     * 排名
+     */
+    private int rank ;
+
+    /**
+     * 导购名称
+     */
+    private String clerkName ;
+
+    /**
+     * 占回数/加好友数/审核通过数/播放量等排序数据
+     */
+    private int rankValue ;
+
+    /**
+     * 内容创作数
+     */
+    private int contentNum ;
+
+    public int getRank() {
+        return rank;
+    }
+
+    public void setRank(int rank) {
+        this.rank = rank;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public int getRankValue() {
+        return rankValue;
+    }
+
+    public void setRankValue(int rankValue) {
+        this.rankValue = rankValue;
+    }
+
+    public int getContentNum() {
+        return contentNum;
+    }
+
+    public void setContentNum(int contentNum) {
+        this.contentNum = contentNum;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ClerkTaskContentPageVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable ;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName: TabClerkTaskContentLog
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2024年09月18日 14:14:28
+ * @Modify
+ * @CopyRight 杭州
+ */
+public class ClerkTaskContentPageVO implements Serializable{
+
+	private static final long serialVersionUID = 625125414387600L;
+
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
+	private Long contentLogId;
+	/**计划ID*/
+	@JsonFormat(shape = JsonFormat.Shape.STRING)
+	private Long planId;
+	/**创建时间*/
+	private java.util.Date createTime;
+	/**内容*/
+	private String content;
+	/**审核状态0待审核1未通过2已通过*/
+	private int statusFlag;
+	/**拒绝理由*/
+	private String reason;
+
+	public Long getContentLogId() {
+		return contentLogId;
+	}
+
+	public void setContentLogId(Long contentLogId) {
+		this.contentLogId = contentLogId;
+	}
+
+	public Long getPlanId() {
+		return planId;
+	}
+
+	public void setPlanId(Long planId) {
+		this.planId = planId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public int getStatusFlag() {
+		return statusFlag;
+	}
+
+	public void setStatusFlag(int statusFlag) {
+		this.statusFlag = statusFlag;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+}
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ClerkTaskListVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ClerkTaskListVO implements Serializable {
+
+    /**id*/
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long planId;
+    /**名称*/
+    private String title;
+    /**开始日期*/
+    private java.util.Date beginDate;
+    /**结束日期*/
+    private java.util.Date endDate;
+    /**1召回 2企微 3内容*/
+    private int taskType;
+
+    /**1未开始  2进行中  3已结束  4已过期 */
+    private int status;
+
+    /**
+     * 图片
+     */
+    private String img ;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Date beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public int getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(int taskType) {
+        this.taskType = taskType;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ConsumeMemberCountVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import java.io.Serializable;
+
+public class ConsumeMemberCountVO implements Serializable {
+
+    /**
+     * 召回总数
+     */
+    private int totalNum ;
+
+    /**
+     * 全退款数
+     */
+    private int refundNum ;
+
+    public int getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(int totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public int getRefundNum() {
+        return refundNum;
+    }
+
+    public void setRefundNum(int refundNum) {
+        this.refundNum = refundNum;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/TaskPlanDetailAwardVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+public class TaskPlanDetailAwardVO implements Serializable {
+
+    /**id*/
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long awardId;
+    /**1定额 2阶梯 3排名*/
+    private int awardMode;
+    /**0创作/召回数/好友数 1播放 2互动 3涨粉*/
+    private int awardType;
+    /**0内容单篇奖励 1内容累计奖励*/
+    private int contentAwardType;
+    /**1点赞数 2收藏数 3分享数 4评论数*/
+    private String contentDataType;
+    /**开启现金1是0否*/
+    private int cashFlag;
+    /**现金值单位(分)*/
+    private int cash;
+    /**礼品1开0关*/
+    private int giftFlag;
+    /**[{"name":"礼品名","num":1}]*/
+    private String giftJson;
+    /**完成数/排名-开始*/
+    private int taskNumStart;
+    /**完成数/排名-结束*/
+    private int taskNumEnd;
+    /**最多奖励次数*/
+    private int maxTimes;
+    /**排序*/
+    private int sort;
+
+    public Long getAwardId() {
+        return awardId;
+    }
+
+    public void setAwardId(Long awardId) {
+        this.awardId = awardId;
+    }
+
+    public int getAwardMode() {
+        return awardMode;
+    }
+
+    public void setAwardMode(int awardMode) {
+        this.awardMode = awardMode;
+    }
+
+    public int getAwardType() {
+        return awardType;
+    }
+
+    public void setAwardType(int awardType) {
+        this.awardType = awardType;
+    }
+
+    public int getContentAwardType() {
+        return contentAwardType;
+    }
+
+    public void setContentAwardType(int contentAwardType) {
+        this.contentAwardType = contentAwardType;
+    }
+
+    public String getContentDataType() {
+        return contentDataType;
+    }
+
+    public void setContentDataType(String contentDataType) {
+        this.contentDataType = contentDataType;
+    }
+
+    public int getCashFlag() {
+        return cashFlag;
+    }
+
+    public void setCashFlag(int cashFlag) {
+        this.cashFlag = cashFlag;
+    }
+
+    public int getCash() {
+        return cash;
+    }
+
+    public void setCash(int cash) {
+        this.cash = cash;
+    }
+
+    public int getGiftFlag() {
+        return giftFlag;
+    }
+
+    public void setGiftFlag(int giftFlag) {
+        this.giftFlag = giftFlag;
+    }
+
+    public String getGiftJson() {
+        return giftJson;
+    }
+
+    public void setGiftJson(String giftJson) {
+        this.giftJson = giftJson;
+    }
+
+    public int getTaskNumStart() {
+        return taskNumStart;
+    }
+
+    public void setTaskNumStart(int taskNumStart) {
+        this.taskNumStart = taskNumStart;
+    }
+
+    public int getTaskNumEnd() {
+        return taskNumEnd;
+    }
+
+    public void setTaskNumEnd(int taskNumEnd) {
+        this.taskNumEnd = taskNumEnd;
+    }
+
+    public int getMaxTimes() {
+        return maxTimes;
+    }
+
+    public void setMaxTimes(int maxTimes) {
+        this.maxTimes = maxTimes;
+    }
+
+    public int getSort() {
+        return sort;
+    }
+
+    public void setSort(int sort) {
+        this.sort = sort;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/TaskPlanDetailContentVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TaskPlanDetailContentVO implements Serializable {
+
+    /**1私域 2公域*/
+    private int contentPublishType;
+    /**1小红书 2视频号*/
+    private String contentPublishChannels;
+    /**1截图 2链接*/
+    private String contentUpType;
+    /**说明*/
+    private String contentRemark;
+    /**主题介绍*/
+    private String contentIntro;
+    /**标题*/
+    private String contentTitle;
+    /**文案*/
+    private String contentTxt;
+    /**话题*/
+    private String contentTheme;
+    /**建议*/
+    private String contentAdvise;
+    /**单篇奖励1开0关*/
+    private int singleAwardFlag;
+    /**达标奖励1开0关*/
+    private int totalAwardFlag;
+    /**统计截止时间*/
+    private Date dataEndTime;
+
+    public int getContentPublishType() {
+        return contentPublishType;
+    }
+
+    public void setContentPublishType(int contentPublishType) {
+        this.contentPublishType = contentPublishType;
+    }
+
+    public String getContentPublishChannels() {
+        return contentPublishChannels;
+    }
+
+    public void setContentPublishChannels(String contentPublishChannels) {
+        this.contentPublishChannels = contentPublishChannels;
+    }
+
+    public String getContentUpType() {
+        return contentUpType;
+    }
+
+    public void setContentUpType(String contentUpType) {
+        this.contentUpType = contentUpType;
+    }
+
+    public String getContentRemark() {
+        return contentRemark;
+    }
+
+    public void setContentRemark(String contentRemark) {
+        this.contentRemark = contentRemark;
+    }
+
+    public String getContentIntro() {
+        return contentIntro;
+    }
+
+    public void setContentIntro(String contentIntro) {
+        this.contentIntro = contentIntro;
+    }
+
+    public String getContentTitle() {
+        return contentTitle;
+    }
+
+    public void setContentTitle(String contentTitle) {
+        this.contentTitle = contentTitle;
+    }
+
+    public String getContentTxt() {
+        return contentTxt;
+    }
+
+    public void setContentTxt(String contentTxt) {
+        this.contentTxt = contentTxt;
+    }
+
+    public String getContentTheme() {
+        return contentTheme;
+    }
+
+    public void setContentTheme(String contentTheme) {
+        this.contentTheme = contentTheme;
+    }
+
+    public String getContentAdvise() {
+        return contentAdvise;
+    }
+
+    public void setContentAdvise(String contentAdvise) {
+        this.contentAdvise = contentAdvise;
+    }
+
+    public int getSingleAwardFlag() {
+        return singleAwardFlag;
+    }
+
+    public void setSingleAwardFlag(int singleAwardFlag) {
+        this.singleAwardFlag = singleAwardFlag;
+    }
+
+    public int getTotalAwardFlag() {
+        return totalAwardFlag;
+    }
+
+    public void setTotalAwardFlag(int totalAwardFlag) {
+        this.totalAwardFlag = totalAwardFlag;
+    }
+
+    public Date getDataEndTime() {
+        return dataEndTime;
+    }
+
+    public void setDataEndTime(Date dataEndTime) {
+        this.dataEndTime = dataEndTime;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/TaskPlanDetailVO.java

+package com.gic.haoban.manage.web.vo.clerktask;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class TaskPlanDetailVO implements Serializable {
+
+    /**id*/
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long planId;
+    /**名称*/
+    private String title;
+    /**开始日期*/
+    private Date beginDate;
+    /**结束日期*/
+    private Date endDate;
+    /**图片*/
+    private String img;
+    /**说明*/
+    private String remark;
+    /**企业id*/
+    private String enterpriseId;
+    /**创建时间*/
+    private Date createTime;
+    // 1未开始  2进行中  3已结束  4已过期
+    private int status ;
+    /**1开放 2指定任务*/
+    private int taskMode;
+    /**1召回 2企微 3内容*/
+    private int taskType;
+    /**召回渠道列表*/
+    private String orderChannels;
+    /**1添加 2添加并认证*/
+    private int qwRule;
+    /**添加非会员开关1是0否*/
+    private int qwNotMemberFlag;
+    /** 1定额 2阶梯 3排名 */
+    private Integer awardMode ;
+
+    /**
+     * 导购完成/奖品信息
+     */
+    private ClerkAwardInfoVO clerkAwardInfo ;
+    /**
+     * 内容配置
+     */
+    private TaskPlanDetailContentVO content ;
+
+    /**
+     * 奖励列表
+     */
+    private List<TaskPlanDetailAwardVO> awardList ;
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Date beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public int getTaskMode() {
+        return taskMode;
+    }
+
+    public void setTaskMode(int taskMode) {
+        this.taskMode = taskMode;
+    }
+
+    public int getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(int taskType) {
+        this.taskType = taskType;
+    }
+
+    public Integer getAwardMode() {
+        return awardMode;
+    }
+
+    public void setAwardMode(Integer awardMode) {
+        this.awardMode = awardMode;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getOrderChannels() {
+        return orderChannels;
+    }
+
+    public void setOrderChannels(String orderChannels) {
+        this.orderChannels = orderChannels;
+    }
+
+    public int getQwRule() {
+        return qwRule;
+    }
+
+    public void setQwRule(int qwRule) {
+        this.qwRule = qwRule;
+    }
+
+    public int getQwNotMemberFlag() {
+        return qwNotMemberFlag;
+    }
+
+    public void setQwNotMemberFlag(int qwNotMemberFlag) {
+        this.qwNotMemberFlag = qwNotMemberFlag;
+    }
+
+    public void setContent(TaskPlanDetailContentVO content) {
+        this.content = content;
+    }
+
+    public void setAwardList(List<TaskPlanDetailAwardVO> awardList) {
+        this.awardList = awardList;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public ClerkAwardInfoVO getClerkAwardInfo() {
+        return clerkAwardInfo;
+    }
+
+    public void setClerkAwardInfo(ClerkAwardInfoVO clerkAwardInfo) {
+        this.clerkAwardInfo = clerkAwardInfo;
+    }
+
+    public TaskPlanDetailContentVO getContent() {
+        return content;
+    }
+
+    public List<TaskPlanDetailAwardVO> getAwardList() {
+        return awardList;
+    }
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -175,6 +175,7 @@
 
     <dubbo:reference id="storeRankApiService" interface="com.gic.enterprise.api.service.rank.StoreRankApiService" timeout="100000" retries="0" check="false" />
     <dubbo:reference id="enterpriseWxaLinkService" interface="com.gic.enterprise.api.service.EnterpriseWxaLinkService" timeout="100000" retries="0" check="false" />
+    <dubbo:reference id="clerkTaskApiService" interface="com.gic.marketing.pro.api.service.clerktask.ClerkTaskApiService" timeout="100000" retries="0" check="false" />