统计接口

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

 package com.gic.haoban.manage.web.controller.hm;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +32,9 @@ import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
 import com.gic.haoban.manage.web.vo.hm.HmLinkListVO;
+import com.gic.haoban.manage.web.vo.hm.HmLinkStatisticsVO;
 import com.gic.haoban.manage.web.vo.hm.HmLinkVO;
+import com.gic.haoban.manage.web.vo.hm.WxUserAddLogVO;
 import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.service.LogRecordUserService;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
@@ -73,14 +76,15 @@ public class HmLinkController {
         dto.setModifierName(loginUser.getClerkName());
         dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         dto.setEnterpriseId(loginUser.getEnterpriseId());
-        ServiceResponse<String> resp = this.hmLinkApiService.save(dto);
-        // if (resp.isSuccess()) {
-        String logContent = "新增引流链接【" + resp.getResult() + "-" + dto.getName() + "】";
-        logger.info(logContent);
-        GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
-        GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
-        // }
-        return RestResponse.successResult();
+        ServiceResponse<String> saveResp = this.hmLinkApiService.save(dto);
+        if (saveResp.isSuccess()) {
+            String logContent = "新增引流链接【" + saveResp.getResult() + "-" + dto.getName() + "】";
+            logger.info(logContent);
+            GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
+            GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
+            return RestResponse.successResult();
+        }
+        return RestResponse.failure(saveResp.getCode(), saveResp.getResult());
     }
 
     @RequestMapping("update")
@@ -93,22 +97,20 @@ public class HmLinkController {
         HmLinkDTO oldDTO = resp.getResult();
         dto.setModifierId(loginUser.getClerkId());
         dto.setModifierName(loginUser.getClerkName());
-        this.hmLinkApiService.save(dto);
-        String logContent = this.getLog(oldDTO, dto);
-        logger.info(logContent);
-        GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
-        GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
-        return RestResponse.successResult();
+        ServiceResponse<String> saveResp = this.hmLinkApiService.save(dto);
+        if (saveResp.isSuccess()) {
+            String logContent = this.getUpdateLog(oldDTO, dto);
+            logger.info(logContent);
+            GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
+            GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
+            return RestResponse.successResult();
+        }
+        return RestResponse.failure(saveResp.getCode(), saveResp.getResult());
     }
 
-    // 编辑引流活码【链接ID-链接名称】：链接名称「 链接名称」变更「 链接名称」，链接描述「 链接描述」变更「 链接描述」，链接标签「
-    // 标签名称-标签值名称」变更为「 标签名称-标签值名称」，分配规则「 层级x-子项名称」关闭，「 层级x-子项名称」开启，欢迎语「
-    // 欢迎语名称」变更为「 欢迎语名称」，欢迎语变更为「 不发送欢迎语」，欢迎语变更为「 活码欢迎语-欢迎语名称」
-    private String getLog(HmLinkDTO oldDTO, HmLinkDTO newDTO) {
+    private String getUpdateLog(HmLinkDTO oldDTO, HmLinkDTO newDTO) {
         String wxEnterpriseId = newDTO.getWxEnterpriseId();
         String enterpriseId = newDTO.getEnterpriseId();
-        StringBuilder sb = new StringBuilder("编辑引流活码").append("【").append(oldDTO.getLinkCode()).append("-")
-                .append(oldDTO.getName()).append("】：");
         StringBuilder content = new StringBuilder();
         String a = comp(wxEnterpriseId, enterpriseId, "链接名称", oldDTO.getName(), newDTO.getName(), 0);
         if (null != a) {
@@ -138,6 +140,8 @@ public class HmLinkController {
         if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d, e, f)) {
             return null;
         }
+        StringBuilder sb = new StringBuilder("编辑引流活码").append("【").append(oldDTO.getLinkCode()).append("-")
+                .append(oldDTO.getName()).append("】：");
         return sb.append(content).toString();
     }
 
@@ -197,16 +201,17 @@ public class HmLinkController {
             JSONObject oldStoreRuleObj = JSONObject.parseObject(oldValue);
             JSONObject newStoreRuleObj = JSONObject.parseObject(newValue);
             logger.info("{},{}", oldStoreRuleObj, newStoreRuleObj);
-            // 层级一-
+            // 服务门店
             HmLinkStoreSettingDTO oldFwStore = oldStoreRuleObj.getObject("fw_store", HmLinkStoreSettingDTO.class);
             HmLinkStoreSettingDTO newFwStore = newStoreRuleObj.getObject("fw_store", HmLinkStoreSettingDTO.class);
             sb.append(ruleLog(oldFwStore, newFwStore, 1));
-            // 层级二
+            // 协管门店
             HmLinkStoreSettingDTO oldXgStore = oldStoreRuleObj.getObject("xg_store", HmLinkStoreSettingDTO.class);
             HmLinkStoreSettingDTO newXgStore = newStoreRuleObj.getObject("xg_store", HmLinkStoreSettingDTO.class);
             sb.append(ruleLog(oldXgStore, newXgStore, 2));
             return sb.toString();
         }
+        // 其他门店
         if (type == 4) {
             JSONObject oldStoreRuleObj = JSONObject.parseObject(oldValue);
             JSONObject newStoreRuleObj = JSONObject.parseObject(newValue);
@@ -331,7 +336,6 @@ public class HmLinkController {
         if (level == 4) {
             title = "省市筛选";
         }
-
         String oldTitle = "";
         String newTitle = "";
         int oldZs = oldStore.getZs();
@@ -464,4 +468,38 @@ public class HmLinkController {
         return RestResponse.successResult(retMap);
     }
 
+    // 链接统计
+    @RequestMapping("statistics/total")
+    public RestResponse<Object> statistics(Long linkId) {
+        HmLinkStatisticsVO vo = new HmLinkStatisticsVO();
+        return RestResponse.successResult(vo);
+    }
+
+    @RequestMapping("statistics/chart")
+    public RestResponse<Object> statisticsChart(Long linkId, Date startTime, Date endTime) {
+        HmLinkStatisticsVO vo = new HmLinkStatisticsVO();
+        List<HmLinkStatisticsVO> list = new ArrayList<>();
+        list.add(vo);
+        return RestResponse.successResult(list);
+    }
+
+    @RequestMapping("statistics/clerk")
+    public RestResponse<Object> statisticsClerk(Long linkId, String storeSearchParams, String clerkSearchParams,
+            Date startTime, Date endTime) {
+        HmLinkStatisticsVO vo = new HmLinkStatisticsVO();
+        List<HmLinkStatisticsVO> list = new ArrayList<>();
+        list.add(vo);
+        return RestResponse.successResult(list);
+    }
+
+    @RequestMapping("statistics/page")
+    public RestResponse<Object> statisticsDetail(Long linkId, String clerkId, Date startTime, Date endTime,
+            BasePageInfo basePageInfo) {
+        List<WxUserAddLogVO> list = new ArrayList<>();
+        list.add(new WxUserAddLogVO());
+        Page<WxUserAddLogVO> page = new Page<>();
+        page.setResult(list);
+        return RestResponse.successResult(page);
+    }
+
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmLinkStatisticsVO.java

@@ -5,10 +5,6 @@ import java.io.Serializable;
 public class HmLinkStatisticsVO implements Serializable {
 
     private static final long serialVersionUID = 3557175079515328622L;
-    // 添加好友人数(总)
-    private Integer addFriendNumTd;
-    // 添加好友人数(今日新增)
-    private Integer addFriendNumD;
     // 今日添加人数
     private Integer addNum;
     // 添加人总数
@@ -21,19 +17,15 @@ public class HmLinkStatisticsVO implements Serializable {
     private Integer clickNumT;
     // 点击总人次
     private Integer clickTimesT;
+    // X轴
+    private String bizDate ;
 
-    public Integer getAddFriendNumTd() {
-        if (null == addFriendNumTd) {
-            return 0;
-        }
-        return addFriendNumTd;
+    public String getBizDate() {
+        return bizDate;
     }
 
-    public Integer getAddFriendNumD() {
-        if (null == addFriendNumD) {
-            return 0;
-        }
-        return addFriendNumD;
+    public void setBizDate(String bizDate) {
+        this.bizDate = bizDate;
     }
 
     public Integer getAddNum() {
@@ -78,14 +70,6 @@ public class HmLinkStatisticsVO implements Serializable {
         return clickTimesT;
     }
 
-    public void setAddFriendNumTd(Integer addFriendNumTd) {
-        this.addFriendNumTd = addFriendNumTd;
-    }
-
-    public void setAddFriendNumD(Integer addFriendNumD) {
-        this.addFriendNumD = addFriendNumD;
-    }
-
     public void setAddNum(Integer addNum) {
         this.addNum = addNum;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/WxUserAddLogVO.java

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable ;
+
+/**
+ * 
+ * @ClassName: TabHaobanWxUserAddLog
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年07月04日 14:07:32
+ * @Modify
+ * @CopyRight 
+ */
+public class WxUserAddLogVO implements Serializable{
+
+	private static final long serialVersionUID = 2226860974309400L;
+	
+	private Long logId;
+	private String wxEnterpriseId;
+	private String enterpriseId;
+	/**外部联系人id*/
+	private String externalUserid;
+	/**成员信息*/
+	private String staffId;
+	private String staffName;
+	/**企微ID*/
+	private String wxUserId;
+	/**1添加 2删除*/
+	private Integer statusFlag;
+	/**0其他场景1引流链接2活码*/
+	private Integer addChannel;
+	/**关联活码*/
+	private Long hmId;
+	private String hmName;
+	/**引流链接*/
+	private Long linkId;
+	private String linkName;
+	/**会员信息*/
+	private String memberId;
+	private String memberName;
+	private String memberNick;
+	private String memberImage;
+	private String memberPhone;
+	private String memberGradeId;
+	private String memberGradeName;
+	private String memberCardNo;
+	/**导购信息*/
+	private String clerkId;
+	private String clerkCode;
+	private String clerkName;
+	/**门店信息*/
+	private String storeId;
+	private String storeName;
+	private String storeCode;
+	/**会员标签*/
+	private String memberLabelId;
+	/**会员标签名*/
+	private String memberLabelName;
+	private java.util.Date createTime;
+	/**是否所有好友删除 1是0否*/
+	private Integer allDelFlag;
+	
+	public void setLogId(Long logId){
+		this.logId = logId;
+	}
+	
+	public Long getLogId(){
+		return logId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId){
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	
+	public String getWxEnterpriseId(){
+		return wxEnterpriseId;
+	}
+	public void setEnterpriseId(String enterpriseId){
+		this.enterpriseId = enterpriseId;
+	}
+	
+	public String getEnterpriseId(){
+		return enterpriseId;
+	}
+	public void setExternalUserid(String externalUserid){
+		this.externalUserid = externalUserid;
+	}
+	
+	public String getExternalUserid(){
+		return externalUserid;
+	}
+	public void setStaffId(String staffId){
+		this.staffId = staffId;
+	}
+	
+	public String getStaffId(){
+		return staffId;
+	}
+	public void setStaffName(String staffName){
+		this.staffName = staffName;
+	}
+	
+	public String getStaffName(){
+		return staffName;
+	}
+	public void setWxUserId(String wxUserId){
+		this.wxUserId = wxUserId;
+	}
+	
+	public String getWxUserId(){
+		return wxUserId;
+	}
+	public void setStatusFlag(Integer statusFlag){
+		this.statusFlag = statusFlag;
+	}
+	
+	public Integer getStatusFlag(){
+		return statusFlag;
+	}
+	public void setAddChannel(Integer addChannel){
+		this.addChannel = addChannel;
+	}
+	
+	public Integer getAddChannel(){
+		return addChannel;
+	}
+	public void setHmId(Long hmId){
+		this.hmId = hmId;
+	}
+	
+	public Long getHmId(){
+		return hmId;
+	}
+	public void setHmName(String hmName){
+		this.hmName = hmName;
+	}
+	
+	public String getHmName(){
+		return hmName;
+	}
+	public void setLinkId(Long linkId){
+		this.linkId = linkId;
+	}
+	
+	public Long getLinkId(){
+		return linkId;
+	}
+	public void setLinkName(String linkName){
+		this.linkName = linkName;
+	}
+	
+	public String getLinkName(){
+		return linkName;
+	}
+	public void setMemberId(String memberId){
+		this.memberId = memberId;
+	}
+	
+	public String getMemberId(){
+		return memberId;
+	}
+	public void setMemberName(String memberName){
+		this.memberName = memberName;
+	}
+	
+	public String getMemberName(){
+		return memberName;
+	}
+	public void setMemberNick(String memberNick){
+		this.memberNick = memberNick;
+	}
+	
+	public String getMemberNick(){
+		return memberNick;
+	}
+	public void setMemberImage(String memberImage){
+		this.memberImage = memberImage;
+	}
+	
+	public String getMemberImage(){
+		return memberImage;
+	}
+	public void setMemberPhone(String memberPhone){
+		this.memberPhone = memberPhone;
+	}
+	
+	public String getMemberPhone(){
+		return memberPhone;
+	}
+	public void setMemberGradeId(String memberGradeId){
+		this.memberGradeId = memberGradeId;
+	}
+	
+	public String getMemberGradeId(){
+		return memberGradeId;
+	}
+	public void setMemberGradeName(String memberGradeName){
+		this.memberGradeName = memberGradeName;
+	}
+	
+	public String getMemberGradeName(){
+		return memberGradeName;
+	}
+	public void setMemberCardNo(String memberCardNo){
+		this.memberCardNo = memberCardNo;
+	}
+	
+	public String getMemberCardNo(){
+		return memberCardNo;
+	}
+	public void setClerkId(String clerkId){
+		this.clerkId = clerkId;
+	}
+	
+	public String getClerkId(){
+		return clerkId;
+	}
+	public void setClerkCode(String clerkCode){
+		this.clerkCode = clerkCode;
+	}
+	
+	public String getClerkCode(){
+		return clerkCode;
+	}
+	public void setClerkName(String clerkName){
+		this.clerkName = clerkName;
+	}
+	
+	public String getClerkName(){
+		return clerkName;
+	}
+	public void setStoreId(String storeId){
+		this.storeId = storeId;
+	}
+	
+	public String getStoreId(){
+		return storeId;
+	}
+	public void setStoreName(String storeName){
+		this.storeName = storeName;
+	}
+	
+	public String getStoreName(){
+		return storeName;
+	}
+	public void setStoreCode(String storeCode){
+		this.storeCode = storeCode;
+	}
+	
+	public String getStoreCode(){
+		return storeCode;
+	}
+	public void setMemberLabelId(String memberLabelId){
+		this.memberLabelId = memberLabelId;
+	}
+	
+	public String getMemberLabelId(){
+		return memberLabelId;
+	}
+	public void setMemberLabelName(String memberLabelName){
+		this.memberLabelName = memberLabelName;
+	}
+	
+	public String getMemberLabelName(){
+		return memberLabelName;
+	}
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return createTime;
+	}
+	public void setAllDelFlag(Integer allDelFlag){
+		this.allDelFlag = allDelFlag;
+	}
+	
+	public Integer getAllDelFlag(){
+		return allDelFlag;
+	}
+}
\ No newline at end of file