Merge branch 'master' into feature-content4-2

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/ContentMaterialROleInitQDTO.java

@@ -30,6 +30,12 @@ public class ContentMaterialROleInitQDTO implements Serializable {
      */
     private Integer version;
 
+    /**
+     * 老版本
+     * null 代表是新增
+     */
+    private Integer oldVersion;
+
     public enum Version {
         LOW(1, "基础版本"),
         HIGH(2, "高级版");
@@ -81,4 +87,12 @@ public class ContentMaterialROleInitQDTO implements Serializable {
     public void setVersion(Integer version) {
         this.version = version;
     }
+
+    public Integer getOldVersion() {
+        return oldVersion;
+    }
+
+    public void setOldVersion(Integer oldVersion) {
+        this.oldVersion = oldVersion;
+    }
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/HaobanClerkTypeEnum.java

@@ -9,20 +9,22 @@ package com.gic.haoban.manage.api.enums;
  **/
 public enum HaobanClerkTypeEnum {
 
-    ;
+    CLERK(0, "导购/店员"),
+    STORE_MANAGER(1, "店长"),
+    AREA_MANAGER(2, "区经");
 
     HaobanClerkTypeEnum(Integer type, String desc){
         this.code = type;
         this.desc = desc;
     }
-    private int code;
+    private Integer code;
     private String desc;
 
-    public int getCode() {
+    public Integer getCode() {
         return code;
     }
 
-    public void setCode(int code) {
+    public void setCode(Integer code) {
         this.code = code;
     }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DealSyncOperationApiService.java

@@ -28,7 +28,6 @@ public interface DealSyncOperationApiService {
     /**
      * mq拆分
      * 部门同步处理
-     * "routerName": "departmentSyncDealMq2"
      *
      * @param params
      */

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -30,6 +30,9 @@ public interface StaffApiService {
      */
     ServiceResponse getWxSaveNew(String userId, String wxEnterpriseId);
 
+    // 是否是同步通讯录,如果是不用每次都查询开启联系我的列表
+    ServiceResponse getWxSaveNew(String userId, String wxEnterpriseId ,boolean isSyncDepart);
+
     /**
      * 新增成员
      *

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -170,4 +170,6 @@ public interface WxEnterpriseRelatedApiService {
 	
 	public int getRelationCount(String enterpriseId) ;
 
+	public com.gic.api.base.commons.ServiceResponse<Integer> getEnterprieseQwType(String enterpriseId) ;
+
 }

haoban-manage3-service/pom.xml

@@ -207,6 +207,12 @@
             <artifactId>gic-operating-api</artifactId>
             <version>${gic-operating-api}</version>
         </dependency>
+        <!-- 数仓 -->
+        <dependency>
+            <groupId>com.alibaba.hologres</groupId>
+            <artifactId>holo-client</artifactId>
+            <version>2.2.10</version>
+        </dependency>
         <dependency>
             <groupId>com.gic</groupId>
             <artifactId>gic-content-api</artifactId>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/content/holo/HoloDataSource.java

+package com.gic.haoban.manage.service.dao.mapper.content.holo;
+
+import com.alibaba.hologres.client.HoloClient;
+import com.alibaba.hologres.client.HoloConfig;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/4 4:11 PM
+ * @Description
+ * @Version
+ **/
+@Slf4j
+@Component
+public class HoloDataSource implements InitializingBean, DisposableBean {
+
+    HoloClient client;
+
+    public synchronized void init() {
+
+        try {
+            Config appConfig = ConfigService.getAppConfig();
+            String holoUrl = appConfig.getProperty("holo.url", "");
+            String holoUserName = appConfig.getProperty("holo.username", "");
+            String holoPassword = appConfig.getProperty("holo.password", "");
+            HoloConfig holoConfig = new HoloConfig();
+            holoConfig.setJdbcUrl(holoUrl);
+            holoConfig.setUsername(holoUserName);
+            holoConfig.setPassword(holoPassword);
+            this.client = new HoloClient(holoConfig);
+            this.client.setAsyncCommit(false);
+            log.info("holo链接初始化完成");
+        }catch (Exception ex) {
+            log.info("初始化client 异常 >>>", ex);
+        }
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        if (client != null) {
+            client.close();
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        if (client == null) {
+            this.init();
+        }
+    }
+
+
+    public HoloClient getClient() {
+        if (this.client == null) {
+            this.init();
+        }
+        return this.client;
+    }
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/content/TabHaobanTriggerCustomerDetail.java

 package com.gic.haoban.manage.service.entity.content;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -56,10 +58,12 @@ public class TabHaobanTriggerCustomerDetail implements Serializable {
     /**
      * 创建时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:dd:ss")
     private Date createTime;
     /**
      * 修改时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:dd:ss")
     private Date updateTime;
     /**
      * 0正常; 1删除

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/content/message/InteractRecordMessageBO.java

@@ -86,4 +86,6 @@ public class InteractRecordMessageBO implements Serializable {
      * @see com.gic.haoban.manage.api.enums.content.ShareBizType
      */
     private Integer bizType;
+
+    private String appKey;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StoreRangeService.java

@@ -113,4 +113,6 @@ public interface StoreRangeService {
     
     List<String> listStoreIdByName( String wxEnterpriseId,  String enterpriseId, String storeName) ;
 
+    public boolean hasStore(String wxEnterpriseId , String enterpriseId, String storeId) ;
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialDataAdaptor.java

@@ -136,7 +136,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
+            return null;
+        }
+        JSONObject jsonObject = dataList.get(0);
         if (jsonObject.isEmpty()) {
             return null;
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MessageConvertHelper.java

+package com.gic.haoban.manage.service.service.content.adaptor;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessageBO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/4 3:14 PM
+ * @Description
+ * @Version
+ **/
+@Slf4j
+@Component
+public class MessageConvertHelper {
+
+
+    /**
+     * 转换消息
+     * @param text
+     * @return
+     */
+    public InteractRecordMessageBO convertMessageBo(String text) {
+
+        JSONObject jsonObject = JSON.parseObject(text);
+        if (MapUtils.isEmpty(jsonObject)) {
+            return null;
+        }
+        InteractRecordMessageBO interactRecordMessageBO = new InteractRecordMessageBO();
+
+        String appKey = jsonObject.getString("app_key");
+        interactRecordMessageBO.setAppKey(appKey);
+
+        String gp = jsonObject.getString("gp");
+        JSONObject gpJson = JSON.parseObject(gp);
+
+        String cusp = jsonObject.getString("cusp");
+        JSONObject cuspJson = JSON.parseObject(cusp);
+
+        String sysp = jsonObject.getString("sysp");
+        JSONObject syspJson = JSON.parseObject(sysp);
+
+        String enterpriseId = gpJson.getString("merch_id");
+        interactRecordMessageBO.setEnterpriseId(enterpriseId);
+
+        String memberId = gpJson.getString("member_id");
+        interactRecordMessageBO.setMemberId(memberId);
+
+        String unionId = gpJson.getString("union_id");
+        interactRecordMessageBO.setUnionId(unionId);
+
+        String clerkId = cuspJson.getString("share_id");
+        interactRecordMessageBO.setClerkId(clerkId);
+
+        String storeId = cuspJson.getString("share_shop_id");
+        interactRecordMessageBO.setStoreId(storeId);
+
+        String materialId = cuspJson.getString("material_id");
+        interactRecordMessageBO.setMaterialId(materialId);
+
+        String shareMaterialChannel = cuspJson.getString("share_material_channel");
+        interactRecordMessageBO.setChannelSource(this.convertChannelSource(shareMaterialChannel));
+
+        String eventCode = jsonObject.getString("event_code");
+        interactRecordMessageBO.setEventType(this.convertEventType(eventCode));
+
+        Integer duration = jsonObject.getInteger("duration");
+        interactRecordMessageBO.setDurationTime(duration);
+
+        String orderNumber = cuspJson.getString("order_number");
+        interactRecordMessageBO.setOrderNumber(orderNumber);
+
+        String goodsId = cuspJson.getString("goods_id");
+        interactRecordMessageBO.setGoodsId(goodsId);
+
+        String runningUuid = jsonObject.getString("runningUuid");
+        interactRecordMessageBO.setBusinessUUId(runningUuid);
+
+        Long lastAccessTime = jsonObject.getLong("server_timestamp");
+        interactRecordMessageBO.setLastAccessTime(lastAccessTime);
+
+        String refUrl = syspJson.getString("ref_url");
+        interactRecordMessageBO.setRefUrl(refUrl);
+
+        return interactRecordMessageBO;
+    }
+
+    private Integer convertChannelSource(String shareMaterialChannel) {
+        if (StringUtils.isBlank(shareMaterialChannel)) {
+            return null;
+        }
+        switch (shareMaterialChannel) {
+            case "null" :
+            case "NULL":
+                return null;
+            case "朋友圈":
+                return 1;
+            case "客户群":
+                return 2;
+            case "对话框":
+                return 3;
+            default:
+                return 0;
+        }
+    }
+
+    private Integer convertEventType(String eventCode) {
+        if (StringUtils.isBlank(eventCode)) {
+            return null;
+        }
+        switch (eventCode) {
+            case "material_page":
+            case "material_page_duration":
+                return 1;
+            case "store_goods_detail":
+                return 2;
+            case "store_buy_sucess":
+                return 3;
+            case "store_add_cart":
+                return 4;
+            default:
+                return null;
+        }
+    }
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/TriggerCustomerDetailServiceImpl.java

 package com.gic.haoban.manage.service.service.content.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.PropertyNamingStrategy;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.hologres.client.HoloClient;
+import com.alibaba.hologres.client.Put;
+import com.alibaba.hologres.client.model.TableSchema;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigService;
+import com.gic.haoban.common.utils.DateUtil;
 import com.gic.haoban.manage.service.dao.mapper.content.TabHaobanTriggerCustomerDetailMapper;
+import com.gic.haoban.manage.service.dao.mapper.content.holo.HoloDataSource;
 import com.gic.haoban.manage.service.entity.content.TabHaobanTriggerCustomerDetail;
 import com.gic.haoban.manage.service.pojo.bo.content.TriggerCustomerDetailBO;
 import com.gic.haoban.manage.service.pojo.qo.content.TriggerCustomerDetailQO;
 import com.gic.haoban.manage.service.service.content.TriggerCustomerDetailService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -29,6 +43,9 @@ public class TriggerCustomerDetailServiceImpl implements TriggerCustomerDetailSe
     @Autowired
     private TabHaobanTriggerCustomerDetailMapper triggerCustomerDetailMapper;
 
+    @Autowired
+    private HoloDataSource holoDataSource;
+
     @Override
     public void save(TriggerCustomerDetailBO triggerCustomerDetailBO) {
 
@@ -42,8 +59,13 @@ public class TriggerCustomerDetailServiceImpl implements TriggerCustomerDetailSe
     @Override
     public void batchSave(List<TriggerCustomerDetailBO> triggerCustomerDetailBos) {
         if (CollectionUtils.isEmpty(triggerCustomerDetailBos)) {
+            log.info("无客户触达日志 >>>> ");
             return;
         }
+        Config appConfig = ConfigService.getAppConfig();
+        // 当前阶段 0双写 1 只写数据表
+        String triggerProcess = appConfig.getProperty("trigger.write", "1");
+        if (StringUtils.equals(triggerProcess, "0")) {
             List<TabHaobanTriggerCustomerDetail> customerDetails = triggerCustomerDetailBos
                     .stream()
                     .map(item -> {
@@ -54,6 +76,37 @@ public class TriggerCustomerDetailServiceImpl implements TriggerCustomerDetailSe
                     .collect(Collectors.toList());
             triggerCustomerDetailMapper.insertBatch(customerDetails);
         }
+        try {
+            HoloClient client = holoDataSource.getClient();
+            if (client == null) {
+                log.error("数仓数据源链接异常, 请检查！！！！{}", JSON.toJSONString(triggerCustomerDetailBos));
+                return;
+            }
+            TableSchema tableSchema = client.getTableSchema("tab_haoban_trigger_customer_detail");
+
+            SerializeConfig serializeConfig = new SerializeConfig();
+            serializeConfig.setPropertyNamingStrategy(PropertyNamingStrategy.SnakeCase);
+            // id, enterprise_id, wx_enterprise_id, biz_id, biz_type, clerk_id, staff_id,store_id, channel_type, customer_id, create_time, update_time, delete_flag
+            List<Put> puts = triggerCustomerDetailBos
+                    .stream()
+                    .map(item -> {
+                        Put temp = new Put(tableSchema);
+                        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(item, serializeConfig));
+                        for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
+                            temp.setObject(entry.getKey(), entry.getValue());
+                        }
+                        // 时间戳格式不行
+                        temp.setObject("create_time", DateUtil.dateToStr(item.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                        temp.setObject("update_time", DateUtil.dateToStr(item.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"));
+                        return temp;
+                    })
+                    .collect(Collectors.toList());
+            client.put(puts);
+            log.info("客户触达写数据组完成 >>>>>");
+        }catch (Exception ex) {
+            log.info("数据组写入异常 {}", JSON.toJSONString(triggerCustomerDetailBos), ex);
+        }
+    }
 
     /**
      * 查询客户触达日志

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageListener.java

 package com.gic.haoban.manage.service.service.content.message;
 
 import com.alibaba.fastjson.JSON;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigService;
 import com.gic.dubbo.entity.ProviderLocalTag;
 import com.gic.haoban.manage.api.enums.content.MaterialInteractRecordEventType;
 import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessageBO;
+import com.gic.haoban.manage.service.service.content.adaptor.MessageConvertHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -25,6 +28,8 @@ public class InteractRecordMessageListener implements MessageListener<String, St
 
     @Autowired
     InteractRecordMessageService interactRecordMessageService;
+    @Autowired
+    MessageConvertHelper messageConvertHelper;
 
     private static final List<Integer> dealEventType = new ArrayList<>();
 
@@ -40,11 +45,21 @@ public class InteractRecordMessageListener implements MessageListener<String, St
         providerLocalTag.traceId = UUID.randomUUID().toString();
         String value = consumerRecord.value();
         log.info("【InteractRecordMessageListener】处理埋点事件 {}", value);
-        InteractRecordMessageBO recordMessageBO = JSON.parseObject(value, InteractRecordMessageBO.class);
+
+
+
+        InteractRecordMessageBO recordMessageBO = messageConvertHelper.convertMessageBo(value);
         if (recordMessageBO == null) {
             log.info("互动记录解析异常 {}", value);
             return;
         }
+        // 过滤环境
+        Config config = ConfigService.getAppConfig();
+        String envKey = config.getProperty("bury.point.env.app.key", "");
+        if (!StringUtils.equalsIgnoreCase(envKey, recordMessageBO.getAppKey())) {
+            log.info("埋点数据环境不正确 config.env: {}, appKey: {}", envKey, recordMessageBO.getAppKey());
+            return;
+        }
         if (recordMessageBO.getEventType() == null || !dealEventType.contains(recordMessageBO.getEventType())) {
             log.info("埋点事件类型非相关类型 {}", recordMessageBO.getEventType());
             return;

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

@@ -3,6 +3,8 @@ package com.gic.haoban.manage.service.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.ToolUtil;
+import com.gic.enterprise.api.dto.StoreGroupDTO;
+import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
@@ -45,6 +47,8 @@ public class StoreRangeServiceImpl implements StoreRangeService {
 
     @Autowired
     private StaffClerkRelationService staffClerkRelationService;
+    @Autowired
+    private StoreGroupService storeGroupService;
 
 
     @Override
@@ -267,4 +271,24 @@ public class StoreRangeServiceImpl implements StoreRangeService {
     public List<String> listStoreIdByName(String wxEnterpriseId, String enterpriseId, String storeName) {
         return tabHaobanStoreRelationMapper.listStoreIdByName(wxEnterpriseId,enterpriseId,storeName);
     }
+
+    @Override
+    public boolean hasStore(String wxEnterpriseId , String enterpriseId, String storeId) {
+        List<String> storeGroupIds = this.listStoreGroupIdByWxEnterpriseId(wxEnterpriseId, enterpriseId);
+        if (CollectionUtils.isEmpty(storeGroupIds)) {
+            logger.info("好办门店分组id为空");
+            return false ;
+        }
+        String[] array = storeGroupIds.toArray(new String[0]);
+        List<StoreGroupDTO> storeGroupDTOS = storeGroupService.listStoreGroup(array, enterpriseId);
+        List<String> parentGroupIds = storeGroupDTOS.stream().map(StoreGroupDTO::getParentGroupId).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(parentGroupIds) && parentGroupIds.contains("0")) {
+            logger.info("企微包含所有门店",wxEnterpriseId);
+            return true ;
+        }
+        if(isFlagByStoreId(storeId,wxEnterpriseId,enterpriseId)) {
+            return true ;
+        }
+        return false ;
+    }
 }

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

@@ -95,7 +95,6 @@ public class AuditApiServiceImpl implements AuditApiService {
         return PageUtil.changePageHelperToCurrentPage(page, AuditDTO.class);
     }
 
-    @Transactional
     @Override
     public String audit(String batchId, String auditId, String auditName, String optStaffId) {
         TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);

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

@@ -526,9 +526,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         return page;
     }
 
-
+    // 同步通讯录
     @Override
     public String dealQywxDepartment(String taskId, String wxEnterpriseId) {
+        logger.info("同步通讯录开始={},taskId={}",wxEnterpriseId,taskId);
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
@@ -732,7 +733,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             logger.info("放入mq={},{}",mqName,JSON.toJSONString(listRet));
-            clientInstance.sendBatchMessages(mqName, listRet, 1);
+            clientInstance.sendBatchMessages(mqName, listRet, 10);
         } catch (Exception e) {
             logger.info("发送失败:{},{}", taskId, JSONObject.toJSONString(listRet));
             e.printStackTrace();
@@ -894,8 +895,9 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
                     this.syncTaskService.updateTaskStatus(taskId,4) ;
                 }
                 if(task.getCreateTime().getTime()+1000*60*60*3< System.currentTimeMillis()) {
-                    logger.info("超过3小时taskId={},{}",taskId);
+                    logger.info("超过3小时taskId={}",taskId);
                     it.remove();
+                    RedisUtil.delLocalCache("department-list-cache-" + task.getWxEnterpriseId());
                     continue;
                 }
                 boolean flag = this.syncDepartmentStaffTask(taskId,type) ;
@@ -934,7 +936,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
             String wxEnterpriseId = syncTask.getWxEnterpriseId();
             this.unlockTask(wxEnterpriseId) ;
+            this.cleanDiffrence(wxEnterpriseId, taskId);
             logger.info("同步通讯录完成");
+            String conectkey = "get_follow_user_list:"+wxEnterpriseId ;
+            RedisUtil.delCache(conectkey) ;
             RedisUtil.unlock(key);
         }
         return true ;
@@ -970,6 +975,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             List<String> dataIds = preDealService.listReDataIdByPDataId(taskId, stffId, PreDealTypeEnum.friend.getVal());
             if (CollectionUtils.isEmpty(dataIds)) {
                 logger.info("无第三方的数据/自建");
+                String staffLockKey = DealSyncOperationApiServiceImpl.FRIEND_LOCK + stffId;
+                RedisUtil.delCache(staffLockKey);
                 preDealService.updateStatusByDataId(taskId, stffId, PreDealTypeEnum.friend_clerk.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
             } else {
                 sendToMq(taskId, new HashSet<>(dataIds), SyncTaskStatusEnum.friend_sync,null);

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

@@ -498,6 +498,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     
     private void addToMq2Mark(String wxEnterpriseId) {
         String key = "qwadd:count2:"+wxEnterpriseId ;
+        if(null != RedisUtil.getCache("qwadd:count:"+wxEnterpriseId)) {
+            RedisUtil.delCache("qwadd:count:"+wxEnterpriseId) ;
+        }
         RedisUtil.setCache(key, 1,600L);
     }
     

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

@@ -205,9 +205,9 @@ public class MessageApiServiceImpl implements MessageApiService {
         Set<String> wxSet = Sets.newHashSet(
                 // 鸿星尔克
                 "e034e2bd5d0b44d3bf553c9f8204094c",
-                // 润臣测试环境
+                // 达摩科技
                 "b18ffdc9d0644912865a248859914d80",
-                // 尊兴
+                // 达摩科技-生产
                 "fb40256db41142a196b21ccf03e58507",
                 // 金华悦行
                 "ac451a350eed4a96958dd5c7377f8bd9");
@@ -243,7 +243,15 @@ public class MessageApiServiceImpl implements MessageApiService {
         log.info("职务名称：position:{}", position);
         clerkQwDTO.setClerkType(StringUtils.isBlank(position) ? 0 : position.contains("店长") ? 1 : 0);
         clerkQwDTO.setClerkGener(dto.getGender());
+        if(StringUtils.isBlank(dto.getMobile()) && dto.getUserid().startsWith("51") && dto.getUserid().length()==12) {
+            clerkQwDTO.setPhoneNumber(dto.getUserid().substring(1));
+        }else {
             clerkQwDTO.setPhoneNumber(dto.getMobile());
+        }
+        if(StringUtils.isBlank(clerkQwDTO.getPhoneNumber())) {
+            log.info("导购手机号不存在{}",dto.getUserid());
+            return ;
+        }
         clerkQwDTO.setNationcode(dto.getTelephone());
         // 调用换导购接口逻辑
         clerkService.syncClerkForQw(clerkQwDTO);

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

@@ -25,6 +25,7 @@ import com.gic.haoban.manage.service.util.DingUtils;
 import com.gic.member.api.dto.MemberTagDTO;
 import com.gic.member.api.service.MemberTagService;
 import com.gic.member.tag.api.dto.MemberTagItemDTO;
+import com.gic.member.tag.api.service.MemberTagApiService;
 import com.gic.member.tag.api.service.MemberTagItemApiService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
@@ -89,6 +90,8 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
     private MemberTagItemApiService memberTagItemApiService;
     @Autowired
     private QywxTagRelationMapper qywxTagRelationMapper;
+    @Autowired
+    private MemberTagApiService memberTagApiService;
 
     @Override
     public void pullQywxTag(String wxEnterpriseId) {
@@ -111,13 +114,42 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Override
     public ServiceResponse syncTagToQywx(String wxEnterpriseId, String enterpriseId, QywxTagInfoDTO infoDTO, List<QywxTagItemDTO> items) {
-        logger.info("保存标签同步");
+        String memberTagId = infoDTO.getMemberTagId() ;
+        logger.info("标签同步到企业微信,wxEnterpriseId={},memberTagId={}",wxEnterpriseId,memberTagId);
+        List<MemberTagItemDTO> tagItems = memberTagApiService.queryMemberTagItem(memberTagId);
+        items = tagItems.stream().map(item -> {
+            QywxTagItemDTO mid = new QywxTagItemDTO();
+            mid.setMemberTagItemId(item.getTagItemId());
+            mid.setQywxTagKey(item.getTagItemId());
+            mid.setQywxTagName(item.getTagItemName());
+            return mid;
+        }).collect(Collectors.toList());
         ServiceResponse ret = new ServiceResponse();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
-        // 如果
-        List<TabQywxTagRelation> list = this.qywxTagRelationMapper.listByMemberTagId(wxEnterpriseId,infoDTO.getMemberTagId()) ;
-        if(CollectionUtils.isNotEmpty(list) && list.size() >= items.size()) {
-            logger.info("标签已存在,直接处理会员");
+        // 判断更新
+        List<QywxTagItemDTO> needAddList = new ArrayList<>() ;
+        List<TabQywxTagRelation> relationList = this.qywxTagRelationMapper.listByMemberTagId(wxEnterpriseId,memberTagId) ;
+        if(CollectionUtils.isNotEmpty(relationList)) {
+            String hbTagId = relationList.get(0).getQywxTagId() ;
+            TabQywxTag tag = this.qywxTagService.getQywxTagByQywxTagId(wxEnterpriseId,hbTagId) ;
+            String qwGroupKey = tag.getQywxGroupKey() ;
+            logger.info("已经存在企微标签,进行更新处理={}",qwGroupKey);
+            QywxGetCorpTagListDTO tagListDTO = this.qywxSuiteApiService.getCorpTagList(qwDTO.getThirdCorpid(),qwDTO.getSelf3thSecret(),Arrays.asList(qwGroupKey),0,qwDTO.isSelf(),qwDTO.getUrlHost()) ;
+            logger.info("企微侧标签={}",JSONObject.toJSONString(tagListDTO));
+            // 更新赋值
+            infoDTO.setQywxGroupKey(qwGroupKey);
+            // 需要添加的标签值
+            List<String> existMemberTagIdList = relationList.stream().map(o->o.getTagItemId()).collect(Collectors.toList());
+            for(QywxTagItemDTO memberTag : items) {
+                if(!existMemberTagIdList.contains(memberTag.getMemberTagItemId())) {
+                    needAddList.add(memberTag) ;
+                }
+            }
+            items = needAddList ;
+            logger.info("更新标签,新增={}",needAddList);
+        }
+        if(CollectionUtils.isEmpty(items)) {
+            logger.info("没有需要处理的标签");
             return ret ;
         }
         //调用企业微信接口保存
@@ -140,7 +172,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             return ret;
         }
         //保存关联关系
-        saveRelation(wxEnterpriseId, enterpriseId, infoDTO, items, savePair);
+        this.saveRelation(wxEnterpriseId, enterpriseId, infoDTO, items, savePair);
         return ret;
     }
 
@@ -183,7 +215,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             itemRelation.setMemberTagId(infoDTO.getMemberTagId());
             itemRelation.setEnterpriseId(enterpriseId);
             itemRelation.setQywxTagItemId(tab.getQywxTagItemId());
-            itemRelation.setTagItemId(orgItem.getQywxTagKey());
+            itemRelation.setTagItemId(orgItem.getMemberTagItemId());
             return itemRelation;
         }).collect(Collectors.toList());
         saveRelationList.addAll(itemList);
@@ -192,8 +224,6 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     /**
      * 调用企业微信接口 保存标签
-     *
-     * @param wxEnterpriseDTO
      * @param infoDTO
      * @param items
      * @return

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

@@ -46,6 +46,7 @@ import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 import com.gic.haoban.manage.service.service.fee.HaobanQywxFeeOrderAccountService;
 import com.gic.haoban.manage.service.service.fee.HaobanQywxFeeOrderService;
+import com.gic.haoban.manage.service.util.DingUtils;
 import com.gic.haoban.manage.service.util.EmojiFilterUtil;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
@@ -248,8 +249,12 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
     }
 
-    @Override
     public ServiceResponse getWxSaveNew(String wxUserId, String wxEnterpriseId) {
+        return this.getWxSaveNew(wxUserId,wxEnterpriseId,false) ;
+    }
+
+    @Override
+    public ServiceResponse getWxSaveNew(String wxUserId, String wxEnterpriseId,boolean isSyncDepart) {
         ServiceResponse res = new ServiceResponse();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (null == qwDTO) {
@@ -299,22 +304,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         TabHaobanStaff staff = new TabHaobanStaff();
         List<StaffDTO> staffDTOList = staffService.listByUserIdsAndWxEnterpriseId(Lists.newArrayList(wxUserId,openUserid), wxEnterpriseId);
         if (CollUtil.isNotEmpty(staffDTOList) && staffDTOList.size()>1) {
-            //只保留一个staff
-            for (int i =0;i<staffDTOList.size()-1;i++){
-                StaffDTO dto = staffDTOList.get(i);
-                String staffId = dto.getStaffId();
-                // 员工解绑
-                List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService
-                        .listByStaffId(wxEnterpriseId, staffId);
-                if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
-                    for (StaffClerkRelationDTO staffClerkRelationDTO : staffClerkRelationDTOS) {
-                        staffClerkRelationService.delBind(staffId, staffClerkRelationDTO.getClerkId(),
-                                ChannelCodeEnum.ADMIN_UNBIND.getCode(),null, wxEnterpriseId);
-                    }
-                }
-                this.staffService.delByStaffId(staffId);
-                staffDTOList.remove(i);
-            }
+            com.gic.haoban.common.utils.DingUtils.send("告警【多条重复staff】,企业ID"+wxEnterpriseId,true);
         }
         if (CollUtil.isNotEmpty(staffDTOList)){
             staff = JSONObject.parseObject(JSONObject.toJSONString(staffDTOList.get(0)), TabHaobanStaff.class);
@@ -348,8 +338,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             staff.setQrCode(qr_code);
         }
         //判断成员是否开启联系我
-        if (this.openConcatFlag(wxEnterpriseId,wxUserId)) {
-            logger.info("成员开启联系我");
+        if (this.openConcatFlag(wxEnterpriseId,wxUserId,isSyncDepart,qwDTO)) {
             staff.setOpenConcatFlag(1);
         }
         //成员更改或更新
@@ -369,16 +358,28 @@ public class StaffApiServiceImpl implements StaffApiService {
         res.setResult(staff.getStaffName());
         return res;
     }
-    private Boolean openConcatFlag(String wxEnterpriseId,String userId){
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        //企微已经开启联系我
+    private Boolean openConcatFlag(String wxEnterpriseId,String userId , boolean isSyncDepart,WxEnterpriseQwDTO qwDTO){
         List<String> wxUserIdsList = null ;
+        //企微已经开启联系我
         Boolean flag = false;
+        String key = "get_follow_user_list:"+wxEnterpriseId ;
+        if(isSyncDepart) {
+            Object o = RedisUtil.getCache(key) ;
+            if(null != o) {
+                logger.info("从缓存中获取联系我列表={}",wxEnterpriseId);
+                wxUserIdsList = (List<String>) o ;
+            }
+        }
+        if(null == wxUserIdsList) {
             if(qwDTO.isSelf()) {
                 wxUserIdsList = qywxUserApiService.listCorpExternalUserSelf(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(),qwDTO.getUrlHost());
             }else {
                 wxUserIdsList = qywxUserApiService.listCorpExternalUser(qwDTO.getThirdCorpid(), config.getWxSuiteid());
             }
+            if(isSyncDepart) {
+                RedisUtil.setCache(key,wxUserIdsList,60*60L);
+            }
+        }
         if (CollUtil.isNotEmpty(wxUserIdsList) && wxUserIdsList.contains(userId)) {
             logger.info("成员开启联系我");
             flag = true;

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

@@ -75,7 +75,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     @Autowired
     private HmQrcodeService hmQrcodeService;
     @Autowired
-    private Config config;
+    private StoreRangeService storeRangeService;
 
     @Override
     public void bindLogMq(String params) {
@@ -303,18 +303,19 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     @Override
     public ServiceResponse wxBindStaffClerk(StaffClerkRelationDTO staffClerkRelation, String optStaffId, int channelCode) {
         Integer manageFlag = staffClerkRelation.getManageFlag();
-        if (manageFlag != null && manageFlag == 1) {
+        if (manageFlag != null && manageFlag.intValue() == 1) {
             ServiceResponse serviceResponse = getManageFlagBind(staffClerkRelation);
             if (!serviceResponse.isSuccess()) {
                 return serviceResponse;
             }
-        }
+        }else {
             String staffId = staffClerkRelation.getStaffId();
             List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listManageBindByStaffId(staffId);
             if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
                 logger.info("该导购已绑定区经，不允许绑定导购");
                 return ServiceResponse.failure("3", "该导购已绑定区经，不允许绑定导购");
             }
+        }
         if (StringUtils.isNotBlank(staffClerkRelation.getStaffClerkRelationId())) {
             TabHaobanStaffClerkRelation oldStaffClerkRelation = tabHaobanStaffClerkRelationMapper.selectByPrimaryKey(staffClerkRelation.getStaffClerkRelationId());
             tabHaobanStaffClerkRelationMapper.delByPrimaryKey(staffClerkRelation.getStaffClerkRelationId());
@@ -513,11 +514,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
                 logger.info("导购未关联成员,oldClerkId={}", oldClerkId);
                 return;
             }
-           /* StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
-            if (null == oldRelationDTO) {
-                logger.info("导购未关联成员,clerkCode={}", clerkCode);
-                return;
-            }*/
+            // 如果新门店未关联好办,进行解绑
+            boolean hasFlag = this.storeRangeService.hasStore(oldRelationDTO.getWxEnterpriseId(),enterpriseId,clerkDTO.getStoreId()) ;
+            if(!hasFlag) {
+                logger.info("新门店未关联好办,storeId={}",clerkDTO.getStoreId());
+                staffClerkRelationService.delBind(oldClerkId, "-1", ChannelCodeEnum.STORE_CHANGE_UNBIND.getCode(), null,null);
+                return ;
+            }
             logger.info("导购门店转移,老的绑定导购id={}", oldRelationDTO.getClerkId());
             this.moveOrAddClerk(clerkSyncQDTO, oldRelationDTO);
         } else if (type == 3) {

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

@@ -730,4 +730,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     public int getRelationCount(String enterpriseId) {
         return this.wxEnterpriseRelatedService.getRelationCount(enterpriseId);
     }
+
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<Integer> getEnterprieseQwType(String enterpriseId) {
+        return this.wxEnterpriseRelatedService.getEnterprieseQwType(enterpriseId);
+    }
 }

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

@@ -304,6 +304,10 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
             appOrderEndTime = now;
         }
         logger.info("已购买付费应用的到期时间:{},合同到期时间：{}",DateUtil.dateToStr(appOrderEndTime,DateUtil.FORMAT_DATETIME_19),DateUtil.dateToStr(endTime,DateUtil.FORMAT_DATETIME_19));
+       //如果过期时间小于当前时间，取当前时间
+        if (now.after(appOrderEndTime)){
+            appOrderEndTime = now;
+        }
         int i = DateUtil.daysBetween(appOrderEndTime, endTime);
         if(i< 0){
             i = 0;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxStaffSyncOperation.java

@@ -61,7 +61,7 @@ public class QywxStaffSyncOperation implements BaseSyncOperation {
         try {
             String taskId = dataPre.getTaskId() ;
             String wxUserId = dealParamMqDTO.getData() ;
-            ServiceResponse response = staffApiService.getWxSaveNew(wxUserId, dataPre.getWxEnterpriseId());
+            ServiceResponse response = staffApiService.getWxSaveNew(wxUserId, dataPre.getWxEnterpriseId(),true);
             if (response.getCode() != 1) {
                 dealFlag = false;
                 reason = response.getMessage();

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/SelfFriendSyncNewOperation.java

@@ -169,7 +169,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
             Log.info("发送队列SelfFriendSyncNewOperation={}",JSON.toJSONString(ret));
-            clientInstance.sendBatchMessages("departmentSyncDealMq2", ret);
+            clientInstance.sendBatchMessages("departmentSyncDealMq", ret);
         } catch (Exception e) {
             logger.info("发送失败:{},{}", taskId);
             e.printStackTrace();

haoban-manage3-service/src/main/resources/kafka-setting-data.xml

@@ -12,7 +12,7 @@
         <constructor-arg>
             <map>
                 <entry key="bootstrap.servers" value="${kafka.data.service}"/>
-                <entry key="group.id" value="haoban-3-data"/>
+                <entry key="group.id" value="${kafka.data.group}"/>
                 <entry key="key.deserializer"
                        value="org.apache.kafka.common.serialization.StringDeserializer"/>
                 <entry key="value.deserializer"

haoban-manage3-service/src/main/resources/mapper/QywxTagRelationMapper.xml

@@ -27,10 +27,11 @@
 <!--    from tab_haoban_qywx_tag_relation-->
 <!--    where qywx_tag_relation_id = #{qywxTagRelationId,jdbcType=VARCHAR}-->
 <!--  </select>-->
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_haoban_qywx_tag_relation
+  <update id="deleteByPrimaryKey" parameterType="java.lang.String">
+    update  tab_haoban_qywx_tag_relation set status_flag = 0 , update_time =now()
     where qywx_tag_relation_id = #{qywxTagRelationId,jdbcType=VARCHAR}
-  </delete>
+  </update>
+
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabQywxTagRelation">
     insert into tab_haoban_qywx_tag_relation (qywx_tag_relation_id, wx_enterprise_id, 
       enterprise_id, member_tag_id, tag_item_id, 

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeOrderAccountMapper.xml

@@ -92,7 +92,7 @@
         <include refid="Base_Column_List"/>
         from tab_haoban_qywx_fee_order_account
         where  wx_enterprise_id = #{wxEnterpriseId}
-        and status in (1,4)
+        and status in (1)
     </select>
 
     <update id="updateByActiveCode">

haoban-manage3-service/src/test/java/PotentialCustomerServiceTest.java

 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.PropertyNamingStrategy;
+import com.alibaba.fastjson.serializer.SerializeConfig;
 import com.gic.api.base.commons.Page;
+import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
+import com.gic.haoban.manage.service.pojo.bo.content.TriggerCustomerDetailBO;
 import com.gic.haoban.manage.service.pojo.qo.content.PotentialCustomerQO;
 import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.content.PotentialCustomerService;
+import com.gic.haoban.manage.service.service.content.TriggerCustomerDetailService;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberService;
 import org.junit.Test;
@@ -13,6 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.Collections;
+import java.util.Date;
+
 /**
  * @Author MUSI
  * @Date 2023/3/30 10:15 PM
@@ -29,6 +37,8 @@ public class PotentialCustomerServiceTest {
     private MemberService memberService;
     @Autowired
     MemberQueryService memberQueryService;
+    @Autowired
+    private TriggerCustomerDetailService triggerCustomerDetailService;
 
     String eid = "ff8080815dacd3a2015dacd3ef5c0000";
     String wxEid = "ca66a01b79474c40b3e7c7f93daf1a3b";
@@ -56,4 +66,32 @@ public class PotentialCustomerServiceTest {
         JSONObject jsonObject = memberQueryService.queryDataSingle(eid, "ff8080818215878101821949a845003c", null);
         System.out.println(jsonObject.toJSONString());
     }
+
+    @Test
+    public void triggerTest(){
+        TriggerCustomerDetailBO triggerCustomerDetailBO = new TriggerCustomerDetailBO();
+        triggerCustomerDetailBO.setId(UniqueIdUtils.uniqueLong());
+        triggerCustomerDetailBO.setCustomerId("dadadada");
+        triggerCustomerDetailBO.setEnterpriseId(eid);
+        triggerCustomerDetailBO.setWxEnterpriseId(wxEid);
+        triggerCustomerDetailBO.setBizId("musidanxieru091210");
+        triggerCustomerDetailBO.setBizType(1);
+        triggerCustomerDetailBO.setClerkId(clerkId);
+        triggerCustomerDetailBO.setStaffId(staffId);
+        triggerCustomerDetailBO.setStoreId(staffId);
+        triggerCustomerDetailBO.setChannelType(1);
+        triggerCustomerDetailBO.setCustomerId(staffId);
+        triggerCustomerDetailBO.setCreateTime(new Date());
+        triggerCustomerDetailBO.setUpdateTime(new Date());
+        triggerCustomerDetailBO.setDeleteFlag(1);
+        triggerCustomerDetailBO.setId(UniqueIdUtils.uniqueLong());
+        triggerCustomerDetailService.batchSave(Collections.singletonList(triggerCustomerDetailBO));
+        triggerCustomerDetailBO.setId(UniqueIdUtils.uniqueLong());
+        triggerCustomerDetailBO.setBizId("musidanxieru091211");
+        triggerCustomerDetailService.batchSave(Collections.singletonList(triggerCustomerDetailBO));
+
+        long time = new Date().getTime();
+        System.out.println((int)time);
+
+    }
 }

haoban-manage3-service/src/test/java/TagTest3.java

+import com.alibaba.fastjson.JSON;
+import com.gic.commons.util.GICMQClientUtil;
+import com.gic.haoban.manage.api.dto.QywxTagInfoDTO;
+import com.gic.haoban.manage.api.dto.QywxTagItemDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.api.service.QywxTagApiService;
+import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
+import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
+import com.gic.mq.sdk.GicMQClient;
+import com.gic.redis.data.util.RedisUtil;
+import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
+import org.apache.commons.collections.CollectionUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
+public class TagTest3 {
+    
+    @Autowired
+    private QywxTagApiService qywxTagApiService  ;
+    @Autowired
+    private HmQrcodeService hmQrcodeService ;    
+    @Autowired
+    private WxEnterpriseService wxEnterpriseService ;
+    @Autowired
+    private Config config ;
+    @Autowired
+    private HmClerkRelationService  hmClerkRelationService ;
+    @Autowired
+    private ExternalClerkRelatedApiService externalClerkRelatedApiService ;
+
+    @Test
+    public void tt() throws InterruptedException {
+
+        // String wxEnterpriseId, String enterpriseId, QywxTagInfoDTO infoDTO, List<QywxTagItemDTO> items
+        String wxEnterpriseId = "ca66a01b79474c40b3e7c7f93daf1a3b" ;
+        String enterpriseId = "ff8080815dacd3a2015dacd3ef5c0000" ;
+        QywxTagInfoDTO infoDTO = new QywxTagInfoDTO() ;
+        infoDTO.setWxEnterpriseId(wxEnterpriseId);
+        infoDTO.setMemberTagId("5b1db406e21748e88737a4cbe194d24f");
+
+        List<QywxTagItemDTO> items = new ArrayList<>() ;
+
+        QywxTagItemDTO mid = new QywxTagItemDTO();
+        mid.setMemberTagItemId("0f08ddb354654638bc8f71ce39fce688");
+        mid.setQywxTagName("企微1");
+        items.add(mid) ;
+
+        QywxTagItemDTO mid2 = new QywxTagItemDTO();
+        mid2.setMemberTagItemId("1e3f324af76842a0a3b7697f95419414");
+        mid2.setQywxTagName("企微2");
+        items.add(mid2) ;
+
+
+        QywxTagItemDTO mid3 = new QywxTagItemDTO();
+        mid3.setMemberTagItemId("qw5");
+        mid3.setQywxTagKey("qw5");
+        mid3.setQywxTagName("企微5");
+        items.add(mid3) ;
+
+        this.qywxTagApiService.syncTagToQywx(wxEnterpriseId,enterpriseId,infoDTO,items) ;
+
+    }
+
+}

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

@@ -336,7 +336,7 @@ public class DepartmentContoller extends WebBaseController {
         Object cache = RedisUtil.getLocalCache("department-list-cache-" + wxEnterpriseId);
         if (null == cache) {
             List<DepartmentShortDTO> list = departmentApiService.listAllDepartment(wxEnterpriseId);
-            RedisUtil.setLocalCache("department-list-cache-" + wxEnterpriseId, list, -1L);
+            RedisUtil.setLocalCache("department-list-cache-" + wxEnterpriseId, list, 60*60*24L);
             return resultResponse(HaoBanErrCode.ERR_1, list);
         } else {
             return resultResponse(HaoBanErrCode.ERR_1, cache);

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

@@ -20,6 +20,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import com.gic.haoban.manage.api.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RRateLimiter;
@@ -48,13 +49,6 @@ import com.gic.haoban.manage.api.dto.WxApplicationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.MaidianLogApiService;
-import com.gic.haoban.manage.api.service.QwFriendApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.TestApiService;
-import com.gic.haoban.manage.api.service.WxApplicationApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
-import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.api.service.out.SecretSettingApiService;
 import com.gic.haoban.manage.web.config.Config;
@@ -104,7 +98,6 @@ public class TestController extends WebBaseController {
     @Autowired
     private QwFriendApiService qwFriendApiService ;
 
-    
     @RequestMapping("/qwcode")
     public HaobanResponse qwcode(String enterpriseId, String unionid,String openid,String wxaUnionid ,String code) {
         return this.resultResponse(HaoBanErrCode.ERR_0,code);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

@@ -166,6 +166,12 @@ public class GroupChatController {
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         qdto.setSearchParams(searchParams);
         qdto.setUserType(userType);
+        if(null == startDate || null == endDate) {
+            return RestResponse.failure("9999","时间不能为空");
+        }
+        if(DateUtil.daysBetween(startDate,endDate) >= 32) {
+            return RestResponse.failure("9999","导出区间不能超过一个月");
+        }
         qdto.setStartDate(startDate);
         qdto.setEndDate(endDate);
         qdto.setStatus(status);

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

@@ -14,7 +14,6 @@
 	<dubbo:application name="haoban-manage3-web"/>
 
 	<dubbo:protocol name="dubbo" port="30009"/>
-	
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseActiveDataApiService" id="wxEnterpriseActiveDataApiService" timeout="10000"/>
 	<dubbo:reference interface="com.gic.enterprise.api.service.DownloadReportService" id="downloadReportService" timeout="10000"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.chat.GroupChatDataApiService" id="groupChatDataApiService" timeout="10000"/>

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

 package com.gic.haoban.manage.web.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.CheckSmsCodeUtil;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
@@ -24,9 +25,8 @@ public class SendCodeController extends WebBaseController {
 
     @Autowired
     private ValidationCodeApiService validationCodeService;
-
     @Autowired
-    private StoreService storeService;
+    private ClerkService clerkService ;
 
     /**
      * 验证码发送
@@ -36,7 +36,7 @@ public class SendCodeController extends WebBaseController {
      */
     @RequestMapping("/send-code")
     public HaobanResponse sendCode(String phoneNumber, @RequestParam(defaultValue = "86") String nationcode,
-                                   Integer type, @RequestParam(defaultValue = "0") int isTest, String wxEnterpriseId, String staffId,
+                                   Integer type, String wxEnterpriseId, String staffId,
                                    String storeId, String clerkId) {
         logger.info("短信验证码发送：wxEnterpriseId:{},storeId:{},staffId:{}", wxEnterpriseId, storeId, staffId);
         if (StringUtils.isBlank(phoneNumber) || null == type) {
@@ -70,15 +70,9 @@ public class SendCodeController extends WebBaseController {
             CheckSmsCodeUtil.cacheSmsCode(nationcode + "-" + phoneNumber, smsCode, type);
         }
         logger.info("{}-{} 的 验证码：{}", nationcode, phoneNumber, smsCode);
-        //非测试
-        if (isTest != 1) {
         SendSmsResponse smsResponse = null;
-            if (StringUtils.isAnyBlank(storeId, clerkId)) {
-                smsResponse = validationCodeService.sendValidationCode(nationcode, phoneNumber, smsCode);
-            } else {
-                StoreDTO storeDTO = storeService.getStore(storeId);
-                smsResponse = validationCodeService.sendValidationCodeHb3(nationcode, phoneNumber, smsCode, storeDTO.getEnterpriseId(), storeId, clerkId, true);
-            }
+        ClerkDTO clerk = this.clerkService.getClerkByClerkId(clerkId) ;
+        smsResponse = validationCodeService.sendValidationCodeHb3(nationcode, phoneNumber, smsCode, clerk.getEnterpriseId(), storeId, clerkId, true);
         logger.info("{}-{} 的 验证码 发送结果回执：{}", nationcode, phoneNumber, JSON.toJSONString(smsResponse));
         if (!smsResponse.isSuccess()) {
             HaobanResponse response = new HaobanResponse();
@@ -87,9 +81,7 @@ public class SendCodeController extends WebBaseController {
             return response;
         }
         return resultResponse(HaoBanErrCode.ERR_1);
-        } else {
-            return resultResponse(HaoBanErrCode.ERR_1, smsCode);
-        }
+
     }
 
     /**

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

@@ -937,7 +937,7 @@ public class WxStaffController extends WebBaseController {
         }
         String storeId = "";
         String storeName = "";
-        if (manageFlag != null && manageFlag == 1) {
+        if (manageFlag != null && manageFlag.intValue() == 1) {
             // 区经无门店
         } else {
             storeId = clerk.getStoreId();

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

@@ -16,10 +16,7 @@ import com.gic.haoban.manage.web.qo.content.statistics.MaterialReportQO;
 import com.gic.haoban.manage.web.qo.content.statistics.MaterialStoreAnalyzeDataQO;
 import com.gic.haoban.manage.web.qo.content.statistics.MaterialStoreReportQO;
 import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialConvsVO;
-import com.gic.haoban.manage.web.vo.content.statistics.MaterialAreaUsedDataVO;
-import com.gic.haoban.manage.web.vo.content.statistics.MaterialClerkUsedDataVO;
-import com.gic.haoban.manage.web.vo.content.statistics.MaterialDataOverviewVO;
-import com.gic.haoban.manage.web.vo.content.statistics.MaterialStoreUsedDataVO;
+import com.gic.haoban.manage.web.vo.content.statistics.*;
 import com.gic.haoban.manage.web.vo.content.statistics.bo.MaterialTodayDataBO;
 import com.gic.haoban.manage.web.vo.content.statistics.bo.MemberVisitMaterialBO;
 import com.gic.haoban.manage.web.vo.content.statistics.report.MaterialPersonalUsedDataVO;
@@ -29,11 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -105,6 +98,10 @@ public class MaterialDataAdaptor {
      */
     private static final String MATERIAL_CREATIVE_CONVS_TOTAL_DATA = "data_cms_matl_examine_convs_total";
 
+    /**
+     * 知识库素材列表数据
+     */
+    private static final String MATERIAL_KNOWL_HAOBAN_DATA = "data_cms_matl_knowl_haoban_list";
 
     @Autowired
     private EnterpriseService enterpriseService;
@@ -521,4 +518,35 @@ public class MaterialDataAdaptor {
         }
         return new ContentMaterialConvsVO();
     }
+
+    /**
+     * 知识库列表数据
+     * @param enterpriseId  企业id
+     * @param materialIdList    素材id列表
+     * @return
+     */
+    public List<ContentMaterialKnowVO> queryKnowData(String enterpriseId, String clerkId,List<Long> materialIdList) {
+
+        Map<String, Object> inlineParams = new HashMap<>();
+        if (CollectionUtils.isEmpty(materialIdList)) {
+            return new ArrayList<>();
+        }
+        inlineParams.put("enterpriseId", enterpriseId);
+        inlineParams.put("contentMaterialId", StringUtils.join(materialIdList, ","));
+        inlineParams.put("visibleClerkId", clerkId);
+        inlineParams.put("pageNum", 1);
+        inlineParams.put("pageSize", materialIdList.size());
+        Map<String, Object> result = null;
+        try {
+            result = DataApiUtils.http(JSON.toJSONString(inlineParams), MATERIAL_KNOWL_HAOBAN_DATA);
+        } catch (Exception e) {
+            log.error("获取知识库数据异常",e);
+            return new ArrayList<>();
+        }
+        List<ContentMaterialKnowVO> list = DataApiUtils.parsePageDataList(result, ContentMaterialKnowVO.class);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return list;
+        }
+        return new ArrayList<>();
+    }
 }

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

+package com.gic.haoban.manage.web.qo.content;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.List;
+
+@JsonSerialize(using= ToStringSerializer.class)
+public class ContentMaterialClerkQO {
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+    /**
+     * 素材id列表
+     */
+    private List<Long> contentMaterialIdList;
+    /**
+     * 导购id
+     */
+    private String clerkId;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public List<Long> getContentMaterialIdList() {
+        return contentMaterialIdList;
+    }
+
+    public void setContentMaterialIdList(List<Long> contentMaterialIdList) {
+        this.contentMaterialIdList = contentMaterialIdList;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+}

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

@@ -36,7 +36,7 @@ public class ContentMaterialListQO extends PageQo {
     private String materialSearch;
 
     /**
-     * 素材类型1图文2纯文字3纯图片4视频
+     * 素材类型1图文2纯文字3纯图片4视频5图文/视频6文件7富文本
      */
     private Integer materialType;
 

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

 package com.gic.haoban.manage.web.qo.content;
 
 import com.gic.commons.web.qo.PageQo;
+import com.gic.content.api.enums.MaterialSearchSceneEnum;
 
 /**
  * @Author MUSI
@@ -10,7 +11,11 @@ import com.gic.commons.web.qo.PageQo;
  **/
 public class ContentMaterialQO extends PageQo {
 
-
+    /**
+     * 查询场景 1:gic后台营销素材 2:好办营销素材 3:gic后台社区素材 4:gic后台审核素材 5:好办审核素材 6:小程序社区素材 7:gic后台知识库 8:好办知识库
+     * @see com.gic.content.api.enums.MaterialSearchSceneEnum
+     */
+    private Integer queryScene = MaterialSearchSceneEnum.HAOBAN_MARKETING.value;
     /**
      * 企业id
      */
@@ -37,7 +42,7 @@ public class ContentMaterialQO extends PageQo {
     private Integer sortType;
 
     /**
-     * 素材类型1图文2纯文字3纯图片4视频
+     * 素材类型1图文2纯文字3纯图片4视频5图文/视频6文件7富文本
      */
     private Integer materialType;
 
@@ -58,6 +63,13 @@ public class ContentMaterialQO extends PageQo {
      */
     private Integer searchType;
 
+    public Integer getQueryScene() {
+        return queryScene;
+    }
+
+    public void setQueryScene(Integer queryScene) {
+        this.queryScene = queryScene;
+    }
 
     public Integer getSortType() {
         return sortType;

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import com.gic.api.base.commons.BasePageInfo;
+import lombok.Data;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 3:25 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class CommentCountQO extends BasePageInfo {
+
+    private static final long serialVersionUID = -4989542424690624006L;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 素材ID
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 导购id
+     */
+    private String clerkId;
+
+    /**
+     * 评论ID （查询子评论使用）取parentContentMaterialCommentId字段，如果有就传，没有就取contentMaterialCommentId
+     */
+    private String contentMaterialCommentId;
+
+    /**
+     * 滚动查询，评论ID
+     */
+    private Long nextContentMaterialCommentId;
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 4:41 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class CommentInfoVO implements Serializable {
+
+    private static final long serialVersionUID = -8820263048755899343L;
+
+    /**
+     * 素材评论id
+     */
+    private Long contentMaterialCommentId;
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 审核状态0未审核1未通过2已通过
+     */
+    private Integer auditStatus;
+
+    /**
+     * 是否置顶0不置顶1置顶
+     */
+    private Integer topFlag;
+
+    /**
+     * 是否公开展示0隐藏1公开
+     */
+    private Integer showFlag;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 会员昵称
+     */
+    private String memberNick;
+
+    /**
+     * 会员头像
+     */
+    private String memberHeadImage;
+
+    /**
+     * 会员删除标记 0:未删除 1：已删除
+     */
+    private Integer memberDeleteFlag = 0;
+
+    /**
+     * 子评论
+     */
+    private List<SonCommentInfoVO> sonComments;
+
+    /**
+     * 子评论数量（已经减去了展示的子评论）
+     */
+    private Integer sonCommentNum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 5:00 PM
+ * @Description
+ * @Version
+ **/
+@Data
+public class SaveCommentQO implements Serializable {
+
+
+    private static final long serialVersionUID = -1584226631161349430L;
+
+    /**
+     * 微信信息
+     */
+    private String wxEnterpriseId;
+
+    /**
+     * 父级素材评论id
+     */
+    private Long parentContentMaterialCommentId;
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 回复的导购ID
+     */
+    private String replyClerkId;
+
+    /**
+     * 导购ID
+     */
+    private String clerkId;
+
+    /**
+     * 企业ID
+     */
+    private String enterpriseId;
+
+    /**
+     * 成员id
+     */
+    private String staffId;
+}

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

+package com.gic.haoban.manage.web.qo.content.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author MUSI
+ * @Date 2023/9/19 4:42 PM
+ * @Description
+ * @Version
+ **/
+
+@Data
+public class SonCommentInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 2419520239887917983L;
+
+    /**
+     * 素材评论id
+     */
+    private Long contentMaterialCommentId;
+
+    /**
+     * 父级素材评论id
+     */
+    private Long parentContentMaterialCommentId;
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论内容
+     */
+    private String commentContent;
+
+    /**
+     * 审核状态0未审核1未通过2已通过
+     */
+    private Integer auditStatus;
+
+    /**
+     * 是否置顶0不置顶1置顶
+     */
+    private Integer topFlag;
+
+    /**
+     * 是否公开展示0隐藏1公开
+     */
+    private Integer showFlag;
+
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 会员昵称
+     */
+    private String memberNick;
+
+    /**
+     * 会员删除标记 0:未删除 1：已删除
+     */
+    private Integer memberDeleteFlag = 0;
+
+    /**
+     * 会员头像
+     */
+    private String memberHeadImage;
+
+    /**
+     * 回复的会员ID
+     */
+    private String replyMemberId;
+
+    /**
+     * 回复的会员昵称
+     */
+    private String replyMemberNick;
+
+    /**
+     * 回复的会员头像
+     */
+    private String replyMemberHeadImage;
+
+    /**
+     * 会员删除标记 0:未删除 1：已删除
+     */
+    private Integer replyMemberDeleteFlag = 0;
+
+    private Boolean isMainComment = false;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

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

+package com.gic.haoban.manage.web.qo.content.like;
+
+import java.io.Serializable;
+
+/**
+ * Created by wangzubo on 2023/9/22.
+ */
+public class ContentMaterialLikeQO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 用户id(导购id)
+     */
+    private String memberId;
+    /**
+     * 用户类型0会员1导购2区经
+     */
+    private Integer userType;
+    /**
+     * 用户code
+     */
+    private String userCode;
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    public ContentMaterialLikeQO() {
+    }
+
+    public ContentMaterialLikeQO(String enterpriseId, String memberId, Integer userType, String userCode, Long contentMaterialId) {
+        this.enterpriseId = enterpriseId;
+        this.memberId = memberId;
+        this.userType = userType;
+        this.userCode = userCode;
+        this.contentMaterialId = contentMaterialId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public Integer getUserType() {
+        return userType;
+    }
+
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public Long getContentMaterialId() {
+        return contentMaterialId;
+    }
+
+    public void setContentMaterialId(Long contentMaterialId) {
+        this.contentMaterialId = contentMaterialId;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialDataVO.java

+package com.gic.haoban.manage.web.vo.content;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.io.Serializable;
+
+public class ContentMaterialDataVO implements Serializable {
+
+    /**
+     * 素材id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long contentMaterialId;
+
+    /**
+     * 点赞数
+     */
+    private Integer likeCount = 0;
+
+    /**
+     * 是否已点赞 1是0否
+     */
+    private Integer likeFlag = 0;
+
+    /**
+     * 评论次数
+     */
+    private Integer cmtCnt = 0;
+
+    /**
+     * 阅读次数
+     */
+    private Integer readCnt = 0;
+
+    public Long getContentMaterialId() {
+        return contentMaterialId;
+    }
+
+    public void setContentMaterialId(Long contentMaterialId) {
+        this.contentMaterialId = contentMaterialId;
+    }
+
+    public Integer getLikeCount() {
+        return likeCount;
+    }
+
+    public void setLikeCount(Integer likeCount) {
+        this.likeCount = likeCount;
+    }
+
+    public Integer getLikeFlag() {
+        return likeFlag;
+    }
+
+    public void setLikeFlag(Integer likeFlag) {
+        this.likeFlag = likeFlag;
+    }
+
+    public Integer getCmtCnt() {
+        return cmtCnt;
+    }
+
+    public void setCmtCnt(Integer cmtCnt) {
+        this.cmtCnt = cmtCnt;
+    }
+
+    public Integer getReadCnt() {
+        return readCnt;
+    }
+
+    public void setReadCnt(Integer readCnt) {
+        this.readCnt = readCnt;
+    }
+
+    public void setDataVO(ContentMaterialDataVO dataVO) {
+        if (dataVO == null) {
+            this.setLikeCount(0);
+            this.setCmtCnt(0);
+            this.setReadCnt(0);
+            return;
+        }
+        this.setLikeCount(dataVO.getLikeCount());
+        this.setCmtCnt(dataVO.getCmtCnt());
+        this.setReadCnt(dataVO.getReadCnt());
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -2,10 +2,14 @@ package com.gic.haoban.manage.web.vo.content;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.ext.ContentMaterialExt;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author MUSI
@@ -33,11 +37,16 @@ public class ContentMaterialInfoVO implements Serializable {
     private String materialContent;
 
     /**
-     * 素材类型1图文2纯文字3纯图片4视频
+     * 素材类型1图文2纯文字3纯图片4视频5图文/视频6文件7富文本
      */
     private Integer materialType;
 
     /**
+     * 是否置顶0不置顶1置顶
+     */
+    private Integer topFlag = 0;
+
+    /**
      * 发布时间
      */
     private Date publishTime;
@@ -84,6 +93,23 @@ public class ContentMaterialInfoVO implements Serializable {
     private String materialVideoFirstImageInfo;
 
     /**
+     * 素材首图url
+     */
+    private String materialFirstImageUrl;
+    /**
+     * 素材首图信息{width:px,height:px,size:Bytes}
+     */
+    private String materialFirstImageInfo;
+    /**
+     * 素材文件url
+     */
+    private String materialFileUrl;
+    /**
+     * 素材文件信息{size:Bytes,name:String}
+     */
+    private String materialFileInfo;
+
+    /**
      * 分享次数
      */
     private Long shareCount;
@@ -121,6 +147,21 @@ public class ContentMaterialInfoVO implements Serializable {
      */
     private Integer sourceType;
 
+    /**
+     * 点赞数
+     */
+    private Long likeCount;
+
+    /**
+     * 是否已点赞 1是0否
+     */
+    private Integer likeFlag;
+
+    /**
+     * 素材额外信息
+     */
+    private ContentMaterialExt ext;
+
 
     public Long getContentMaterialId() {
         return contentMaterialId;
@@ -154,6 +195,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialType = materialType;
     }
 
+    public Integer getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(Integer topFlag) {
+        this.topFlag = topFlag;
+    }
+
     public Date getPublishTime() {
         return publishTime;
     }
@@ -194,6 +243,38 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialVideoFirstImageUrl = materialVideoFirstImageUrl;
     }
 
+    public String getMaterialFirstImageUrl() {
+        return materialFirstImageUrl;
+    }
+
+    public void setMaterialFirstImageUrl(String materialFirstImageUrl) {
+        this.materialFirstImageUrl = materialFirstImageUrl;
+    }
+
+    public String getMaterialFirstImageInfo() {
+        return materialFirstImageInfo;
+    }
+
+    public void setMaterialFirstImageInfo(String materialFirstImageInfo) {
+        this.materialFirstImageInfo = materialFirstImageInfo;
+    }
+
+    public String getMaterialFileUrl() {
+        return materialFileUrl;
+    }
+
+    public void setMaterialFileUrl(String materialFileUrl) {
+        this.materialFileUrl = materialFileUrl;
+    }
+
+    public String getMaterialFileInfo() {
+        return materialFileInfo;
+    }
+
+    public void setMaterialFileInfo(String materialFileInfo) {
+        this.materialFileInfo = materialFileInfo;
+    }
+
     public Long getShareCount() {
         return shareCount;
     }
@@ -289,4 +370,42 @@ public class ContentMaterialInfoVO implements Serializable {
     public void setMaterialVideoFirstImageInfo(String materialVideoFirstImageInfo) {
         this.materialVideoFirstImageInfo = materialVideoFirstImageInfo;
     }
+
+    public Long getLikeCount() {
+        return likeCount;
+    }
+
+    public void setLikeCount(Long likeCount) {
+        this.likeCount = likeCount;
+    }
+
+    public Integer getLikeFlag() {
+        return likeFlag;
+    }
+
+    public void setLikeFlag(Integer likeFlag) {
+        this.likeFlag = likeFlag;
+    }
+
+    public ContentMaterialExt getExt() {
+        return ext;
+    }
+
+    public void setExt(ContentMaterialExt ext) {
+        this.ext = ext;
+    }
+
+    public void convertMaterialImages(String materialImageUrls, String materialThumbnailImageUrls) {
+        if (StringUtils.isNotBlank(materialImageUrls)) {
+            String[] split = StringUtils.split(materialImageUrls, ",");
+            List<String> imageUrls = Arrays.stream(split).collect(Collectors.toList());
+            this.setMaterialImageUrls(imageUrls);
+        }
+        if (StringUtils.isNotBlank(materialThumbnailImageUrls)) {
+            String[] split = StringUtils.split(materialThumbnailImageUrls, ",");
+            List<String> imageUrls = Arrays.stream(split).collect(Collectors.toList());
+            this.setMaterialThumbnailImageUrls(imageUrls);
+        }
+    }
+
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/statistics/ContentMaterialKnowVO.java

+package com.gic.haoban.manage.web.vo.content.statistics;
+
+import java.io.Serializable;
+
+public class ContentMaterialKnowVO implements Serializable {
+
+    /**
+     * 素材id
+     */
+    private Long contentMaterialId;
+
+    /**
+     * 评论人数
+     */
+    private Integer cmtNum;
+
+    /**
+     * 评论次数
+     */
+    private Integer cmtCnt;
+
+    /**
+     * 阅读人数
+     */
+    private Integer readNum;
+
+    /**
+     * 阅读次数
+     */
+    private Integer readCnt;
+
+    /**
+     * 点赞人数
+     */
+    private Integer likeNum;
+
+    /**
+     * 点赞次数
+     */
+    private Integer likeCnt;
+
+    public ContentMaterialKnowVO() {
+    }
+
+    public ContentMaterialKnowVO(Integer cmtNum, Integer cmtCnt, Integer readNum, Integer readCnt, Integer likeNum, Integer likeCnt) {
+        this.cmtNum = cmtNum;
+        this.cmtCnt = cmtCnt;
+        this.readNum = readNum;
+        this.readCnt = readCnt;
+        this.likeNum = likeNum;
+        this.likeCnt = likeCnt;
+    }
+
+    public void setKnow(ContentMaterialKnowVO know) {
+        if (know == null) {
+            this.setCmtNum(0);
+            this.setCmtCnt(0);
+            this.setReadCnt(0);
+            this.setReadNum(0);
+            this.setLikeCnt(0);
+            this.setLikeNum(0);
+            return;
+        }
+        this.setCmtNum(know.getCmtNum());
+        this.setCmtCnt(know.getCmtCnt());
+        this.setReadCnt(know.getReadCnt());
+        this.setReadNum(know.getReadNum());
+        this.setLikeCnt(know.getLikeCnt());
+        this.setLikeNum(know.getLikeNum());
+    }
+
+    public Long getContentMaterialId() {
+        return contentMaterialId;
+    }
+
+    public void setContentMaterialId(Long contentMaterialId) {
+        this.contentMaterialId = contentMaterialId;
+    }
+
+    public Integer getCmtNum() {
+        return cmtNum;
+    }
+
+    public void setCmtNum(Integer cmtNum) {
+        this.cmtNum = cmtNum;
+    }
+
+    public Integer getCmtCnt() {
+        return cmtCnt;
+    }
+
+    public void setCmtCnt(Integer cmtCnt) {
+        this.cmtCnt = cmtCnt;
+    }
+
+    public Integer getReadNum() {
+        return readNum;
+    }
+
+    public void setReadNum(Integer readNum) {
+        this.readNum = readNum;
+    }
+
+    public Integer getReadCnt() {
+        return readCnt;
+    }
+
+    public void setReadCnt(Integer readCnt) {
+        this.readCnt = readCnt;
+    }
+
+    public Integer getLikeNum() {
+        return likeNum;
+    }
+
+    public void setLikeNum(Integer likeNum) {
+        this.likeNum = likeNum;
+    }
+
+    public Integer getLikeCnt() {
+        return likeCnt;
+    }
+
+    public void setLikeCnt(Integer likeCnt) {
+        this.likeCnt = likeCnt;
+    }
+}

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

@@ -150,5 +150,7 @@
                      id="goodsCenterApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.haoban.commission.api.service.local.CommissionSettleDetailApiService"
                      id="commissionSettleDetailApiService" timeout="10000" retries="0" check="false" />
+    <dubbo:reference interface="com.gic.content.api.service.ContentMaterialCommentApiService"
+                     id="contentMaterialCommentApiService" timeout="10000" retries="0" check="false" />
 
 </beans>