Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ClerkStaffWxUserDTO.java

@@ -11,6 +11,10 @@ import java.io.Serializable;
 public class ClerkStaffWxUserDTO implements Serializable {
     private static final long serialVersionUID = -5124016907535027993L;
     /**
+     * 会员对外联系人id
+     */
+    private String memberExternalUserId;
+    /**
      * 导购员工的外部联系人id-wxUserId
      */
     private String staffWxUserId;
@@ -22,11 +26,20 @@ public class ClerkStaffWxUserDTO implements Serializable {
     public ClerkStaffWxUserDTO() {
     }
 
-    public ClerkStaffWxUserDTO(String staffWxUserId, String staffClerkId) {
+    public ClerkStaffWxUserDTO(String staffWxUserId, String staffClerkId, String memberExternalUserId) {
+        this.memberExternalUserId = memberExternalUserId;
         this.staffWxUserId = staffWxUserId;
         this.staffClerkId = staffClerkId;
     }
 
+    public String getMemberExternalUserId() {
+        return memberExternalUserId;
+    }
+
+    public void setMemberExternalUserId(String memberExternalUserId) {
+        this.memberExternalUserId = memberExternalUserId;
+    }
+
     public String getStaffWxUserId() {
         return staffWxUserId;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ErrorLogDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * tab_haoban_error_log
+ * @author 
+ */
+public class ErrorLogDTO implements Serializable {
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 模块描述 例：haoban-commission-service
+     */
+    private String moduleDesc;
+
+    /**
+     * 错误描述，系统错误、参数错误、调用错误
+     */
+    private String errorDesc;
+
+    /**
+     * 错误标识id
+     */
+    private String errorFlagId;
+
+    /**
+     * 错误参数
+     */
+    private String errorParam;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getModuleDesc() {
+        return moduleDesc;
+    }
+
+    public void setModuleDesc(String moduleDesc) {
+        this.moduleDesc = moduleDesc;
+    }
+
+    public String getErrorDesc() {
+        return errorDesc;
+    }
+
+    public void setErrorDesc(String errorDesc) {
+        this.errorDesc = errorDesc;
+    }
+
+    public String getErrorFlagId() {
+        return errorFlagId;
+    }
+
+    public void setErrorFlagId(String errorFlagId) {
+        this.errorFlagId = errorFlagId;
+    }
+
+    public String getErrorParam() {
+        return errorParam;
+    }
+
+    public void setErrorParam(String errorParam) {
+        this.errorParam = errorParam;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
\ No newline at end of file

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

@@ -25,7 +25,7 @@ public interface PendingTaskApiService {
 
 
     /**
-     * 待办批量
+     * 待办批量 活动任务
      *
      * @param qdto
      */
@@ -110,9 +110,9 @@ public interface PendingTaskApiService {
     public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime);
 
     /**
-     * 更新失效或者结束时间
+     * 更新失效或者结束时间 活动任务
      *
-     * @param relationId
+     * @param businessId
      * @param endTime
      * @return
      */

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

+package com.gic.haoban.manage.api.service.out;
+
+import com.gic.haoban.manage.api.dto.ErrorLogDTO;
+
+/**
+ * desc：好办错误日志服务接口
+ *
+ * @author: YongEn
+ * @date: 2022/1/18
+ **/
+public interface ErrorLogApiService {
+
+    /**
+     * desc: 保存
+     *
+     * @param dto
+     * @return :
+     * @author : YongEn
+     * @date : 2022/1/18
+     */
+    void save(ErrorLogDTO dto);
+
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PendingTaskMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 @Mapper
 public interface PendingTaskMapper {
@@ -39,6 +40,11 @@ public interface PendingTaskMapper {
     TabPendingTask getByRelationId(String relationId);
 
     /**
+     * 根据关联id 查询单条
+     */
+    List<TabPendingTask> listByRelationId(@Param("relationIds") List<String> relationIds);
+
+    /**
      * 分页查询待办任务表
      *
      * @param enterpriseId 企业id
@@ -80,10 +86,10 @@ public interface PendingTaskMapper {
     /**
      * 更新失效时间
      *
-     * @param enterpriseId 企业id
+     * @param businessId 企业id
      * @return
      */
-    public int updateInvalidTimeByBusinessId(@Param("businessId") String businessId, @Param("") Date invalidTime);
+    public int updateInvalidTimeByBusinessId(@Param("businessId") String businessId, @Param("invalidTime") Date invalidTime);
 
     /**
      * 更新失效时间
@@ -93,5 +99,17 @@ public interface PendingTaskMapper {
      */
     public int deleteByBusinessId(@Param("businessId") String businessId);
 
+    /**
+     * 批量插入
+     */
+    int insertBatch(@Param("list") List<TabPendingTask> list);
+
+    /**
+     * 更新删除状态到正常 活动任务
+     * @param relationIds
+     * @return
+     */
+    int updateDelToNormalByRelationIds(@Param("relationIds") Set<String> relationIds, @Param("invalidTime") Date invalidTime);
+
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanErrorLogMapper.java

+package com.gic.haoban.manage.service.dao.mapper;
+
+import com.gic.haoban.manage.service.entity.TabHaobanErrorLog;
+
+public interface TabHaobanErrorLogMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(TabHaobanErrorLog record);
+
+    int insertSelective(TabHaobanErrorLog record);
+
+    TabHaobanErrorLog selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(TabHaobanErrorLog record);
+
+    int updateByPrimaryKey(TabHaobanErrorLog record);
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_haoban_error_log
+ * @author 
+ */
+public class TabHaobanErrorLog implements Serializable {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+
+    /**
+     * 模块描述 例：haoban-commission-service
+     */
+    private String moduleDesc;
+
+    /**
+     * 错误描述，系统错误、参数错误、调用错误
+     */
+    private String errorDesc;
+
+    /**
+     * 错误标识id
+     */
+    private String errorFlagId;
+
+    /**
+     * 错误参数
+     */
+    private String errorParam;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getModuleDesc() {
+        return moduleDesc;
+    }
+
+    public void setModuleDesc(String moduleDesc) {
+        this.moduleDesc = moduleDesc;
+    }
+
+    public String getErrorDesc() {
+        return errorDesc;
+    }
+
+    public void setErrorDesc(String errorDesc) {
+        this.errorDesc = errorDesc;
+    }
+
+    public String getErrorFlagId() {
+        return errorFlagId;
+    }
+
+    public void setErrorFlagId(String errorFlagId) {
+        this.errorFlagId = errorFlagId;
+    }
+
+    public String getErrorParam() {
+        return errorParam;
+    }
+
+    public void setErrorParam(String errorParam) {
+        this.errorParam = errorParam;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/ext/MemberStaffRelExtDO.java

@@ -15,6 +15,10 @@ public class MemberStaffRelExtDO implements Serializable {
      */
     private String memberId;
     /**
+     * 会员对外联系人id
+     */
+    private String memberExternalUserId;
+    /**
      * 导购员工的外部联系人id-wxUserId
      */
     private String staffWxUserId;
@@ -31,6 +35,14 @@ public class MemberStaffRelExtDO implements Serializable {
         this.memberId = memberId;
     }
 
+    public String getMemberExternalUserId() {
+        return memberExternalUserId;
+    }
+
+    public void setMemberExternalUserId(String memberExternalUserId) {
+        this.memberExternalUserId = memberExternalUserId;
+    }
+
     public String getStaffWxUserId() {
         return staffWxUserId;
     }

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

+package com.gic.haoban.manage.service.service;
+
+import com.gic.haoban.manage.service.entity.TabHaobanErrorLog;
+
+/**
+ * desc：好办错误日志服务
+ *
+ * @author: YongEn
+ * @date: 2022/1/18
+ **/
+public interface ErrorLogService {
+
+    /**
+     * desc: 保存错误日志
+     *
+     * @param errorLog
+     * @return :
+     * @author : YongEn
+     * @date : 2022/1/18
+     */
+    void save(TabHaobanErrorLog errorLog);
+
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanErrorLogMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanErrorLog;
+import com.gic.haoban.manage.service.service.ErrorLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * desc：
+ *
+ * @author: YongEn
+ * @date: 2022/1/18
+ **/
+@Service
+public class ErrorLogServiceImpl implements ErrorLogService {
+
+    @Autowired
+    private TabHaobanErrorLogMapper tabHaobanErrorLogMapper;
+
+    @Override
+    public void save(TabHaobanErrorLog errorLog) {
+        errorLog.setId(UniqueIdUtils.uniqueLong());
+        errorLog.setCreateTime(new Date());
+        errorLog.setUpdateTime(new Date());
+        tabHaobanErrorLogMapper.insert(errorLog);
+    }
+}

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

@@ -22,6 +22,14 @@ public interface PendingTaskService {
     public boolean addOrUpdatePendingTask(PendingTaskBO task);
 
     /**
+     * 新增或更新
+     *
+     * @param task
+     * @return
+     */
+    public boolean addOrUpdateBatchPendingTask(List<PendingTaskBO> task);
+
+    /**
      * 分页查询待办任务表
      *
      * @param enterpriseId 企业id
@@ -55,6 +63,7 @@ public interface PendingTaskService {
      */
     public boolean deletePendingTask(List<String> relationIds);
 
+
     /**
      * 删除执行人列表
      *

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

@@ -15,6 +15,9 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Created 2021/12/15.
@@ -44,6 +47,37 @@ public class PendingTaskServiceImpl implements PendingTaskService {
     }
 
     @Override
+    public boolean addOrUpdateBatchPendingTask(List<PendingTaskBO> tasks) {
+        if (CollectionUtils.isEmpty(tasks)) {
+            return true;
+        }
+        List<String> relationIds = tasks.stream().map(mid -> mid.getRelationId()).collect(Collectors.toList());
+        List<TabPendingTask> tabPendingTasks = pendingTaskMapper.listByRelationId(relationIds);
+        if (CollectionUtils.isNotEmpty(tabPendingTasks)) {
+            Map<String, TabPendingTask> pendingTaskMap = tabPendingTasks.stream().collect(Collectors.toMap(tab -> tab.getRelationId(), tab -> tab));
+            Set<String> hasRelationIds = pendingTaskMap.keySet();
+            pendingTaskMapper.updateDelToNormalByRelationIds(hasRelationIds,tasks.get(0).getInvalidTime());
+            tasks = tasks.stream().filter(mid->!pendingTaskMap.containsKey(mid.getRelationId())).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(tasks)) {
+            return true;
+        }
+        List<TabPendingTask> pendingTasks = EntityUtil.changeEntityListByJSON(TabPendingTask.class, tasks);
+
+        int size=1000;
+        int len = pendingTasks.size();
+        int yu = len % size;
+        int nu = len / size+(yu>0?1:0);
+        for (int i=0;i<nu;i++) {
+            int start=i*size;
+            int end=(start+size)>len?(start+yu):(start+size);
+            List<TabPendingTask> midTask = pendingTasks.subList(start, end);
+            pendingTaskMapper.insertBatch(midTask);
+        }
+        return true;
+    }
+
+    @Override
     public Page<PendingTaskBO> pagePendingTask(String enterpriseId, String storeId, String clerkId, int taskType, int finishFlag, int overdueFlag, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
         List<TabPendingTask> tabPendingTasks = pendingTaskMapper.listPendingTask(enterpriseId, storeId, clerkId, taskType, finishFlag, overdueFlag);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Created 2021/12/16.
@@ -46,14 +47,12 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
 
     @Override
     public ServiceResponse<Boolean> addPendingTaskBatch(List<PendingTaskQDTO> qdto) {
-        //后续优化
         if (CollectionUtils.isEmpty(qdto)) {
             return ServiceResponse.success(true);
         }
 
-        qdto.forEach(mid -> {
-            this.addPendingTask(mid);
-        });
+        List<PendingTaskBO> list = EntityUtil.changeEntityListByJSON(PendingTaskBO.class, qdto);
+        pendingTaskService.addOrUpdateBatchPendingTask(list);
         return ServiceResponse.success(true);
     }
 

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

+package com.gic.haoban.manage.service.service.out.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.manage.api.dto.ErrorLogDTO;
+import com.gic.haoban.manage.api.service.out.ErrorLogApiService;
+import com.gic.haoban.manage.service.entity.TabHaobanErrorLog;
+import com.gic.haoban.manage.service.service.ErrorLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * desc：好办错误日志服务实现
+ *
+ * @author: YongEn
+ * @date: 2022/1/18
+ **/
+@Service
+public class ErrorLogApiServiceImpl implements ErrorLogApiService {
+
+    @Autowired
+    private ErrorLogService errorLogService;
+
+    @Override
+    public void save(ErrorLogDTO dto) {
+        TabHaobanErrorLog errorLog = EntityUtil.changeEntityNew(TabHaobanErrorLog.class, dto);
+        errorLogService.save(errorLog);
+    }
+}

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

@@ -306,7 +306,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                 // key-memberId
                 MemberStaffRelExtDO::getMemberId,
                 // value-list
-                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffWxUserId(), e.getStaffClerkId()))),
+                e -> new ArrayList<>(Collections.singletonList(new ClerkStaffWxUserDTO(e.getStaffWxUserId(), e.getStaffClerkId(), e.getMemberExternalUserId()))),
                 // 重复key的value添加到集合
                 (List<ClerkStaffWxUserDTO> oldList, List<ClerkStaffWxUserDTO> newList) -> {
                     oldList.addAll(newList);

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

@@ -217,12 +217,14 @@
     from tab_haoban_notice_message
     where enterprise_id = #{enterpriseId}
     and store_id = #{storeId}
+    and delete_flag=0
     <if test="clerkId != null">
       and clerk_id =#{clerkId}
     </if>
     <if test="categoryType != -1">
       and category_type =#{categoryType}
     </if>
+    and create_time > DATE_SUB(now(),INTERVAL 30 DAY)
     order by create_time desc
   </select>
 
@@ -232,6 +234,7 @@
     from tab_haoban_notice_message
     where enterprise_id = #{enterpriseId}
     and read_flag=0
+    and delete_flag=0
     and store_id = #{storeId}
     <if test="clerkId != null">
       and clerk_id =#{clerkId}
@@ -239,6 +242,7 @@
     <if test="categoryType != -1">
       and category_type =#{categoryType}
     </if>
+    and create_time > DATE_SUB(now(),INTERVAL 30 DAY)
     order by create_time desc
   </select>
 
@@ -248,8 +252,10 @@
     WHERE enterprise_id = #{enterpriseId}
     and clerk_id = #{clerkId}
     and read_flag=0
+    and delete_flag=0
     <if test="categoryType!=-1">
       and category_type=#{categoryType}
     </if>
+    and create_time > DATE_SUB(now(),INTERVAL 30 DAY)
   </update>
 </mapper>
\ No newline at end of file

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

@@ -251,6 +251,16 @@
         where relation_id = #{relationId}
     </select>
 
+    <select id="listByRelationId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_pending_task
+        where relation_id in
+              <foreach collection="relationIds" open="(" separator="," close=")" item="item">
+                  #{item}
+              </foreach>
+    </select>
+
     <select id="listPendingTask" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -309,8 +319,9 @@
     <update id="updateInvalidTimeByBusinessId">
         update tab_haoban_pending_task
         set
-        update_time = now(),
-        invalid_time = #{invalidTime}
+            update_time = now(),
+            invalid_time = #{invalidTime},
+            overdue_time = #{invalidTime}
         where business_id = #{businessId}
     </update>
 
@@ -321,4 +332,37 @@
             update_time = now()
         where business_id = #{businessId} and delete_flag=0
     </update>
+
+    <insert id="insertBatch" >
+        insert into tab_haoban_pending_task ( enterprise_id, relation_id,
+          task_type, title, description,
+          task_status_flag, overdue_time, invalid_time,
+          store_id, clerk_id, finish_time,
+          finish_flag, overdue_flag, delete_flag,
+          create_time, update_time)
+        values
+        <foreach collection="list" item="item" separator=",">
+            ( #{item.enterpriseId,jdbcType=VARCHAR}, #{item.relationId,jdbcType=VARCHAR},
+            #{item.taskType,jdbcType=INTEGER}, #{item.title,jdbcType=VARCHAR}, #{item.description,jdbcType=VARCHAR},
+            0, #{item.overdueTime,jdbcType=TIMESTAMP}, #{item.invalidTime,jdbcType=TIMESTAMP},
+            #{item.storeId,jdbcType=VARCHAR}, #{item.clerkId,jdbcType=VARCHAR}, #{item.finishTime,jdbcType=TIMESTAMP},
+            0, 0, 0,
+            now(), now())
+        </foreach>
+
+    </insert>
+
+    <update id="updateDelToNormalByRelationIds">
+        update tab_haoban_pending_task
+        set
+            delete_flag=0,
+            update_time = now(),
+            invalid_time = #{invalidTime},
+            overdue_time = #{invalidTime}
+        where
+              relation_id in
+            <foreach collection="relationIds" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+    </update>
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanErrorLogMapper">
+  <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanErrorLog">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId" />
+    <result column="module_desc" jdbcType="VARCHAR" property="moduleDesc" />
+    <result column="error_desc" jdbcType="VARCHAR" property="errorDesc" />
+    <result column="error_flag_id" jdbcType="VARCHAR" property="errorFlagId" />
+    <result column="error_param" jdbcType="VARCHAR" property="errorParam" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, enterprise_id, module_desc, error_desc, error_flag_id, error_param, remark, create_time, 
+    update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_error_log
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from tab_haoban_error_log
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.gic.haoban.manage.service.entity.TabHaobanErrorLog" useGeneratedKeys="true">
+    insert into tab_haoban_error_log (id,enterprise_id, module_desc, error_desc,
+      error_flag_id, error_param, remark, 
+      create_time, update_time)
+    values (#{id,jdbcType=BIGINT}, #{enterpriseId,jdbcType=VARCHAR}, #{moduleDesc,jdbcType=VARCHAR}, #{errorDesc,jdbcType=VARCHAR},
+      #{errorFlagId,jdbcType=VARCHAR}, #{errorParam,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.gic.haoban.manage.service.entity.TabHaobanErrorLog" useGeneratedKeys="true">
+    insert into tab_haoban_error_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="moduleDesc != null">
+        module_desc,
+      </if>
+      <if test="errorDesc != null">
+        error_desc,
+      </if>
+      <if test="errorFlagId != null">
+        error_flag_id,
+      </if>
+      <if test="errorParam != null">
+        error_param,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=VARCHAR},
+      </if>
+      <if test="moduleDesc != null">
+        #{moduleDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="errorDesc != null">
+        #{errorDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="errorFlagId != null">
+        #{errorFlagId,jdbcType=VARCHAR},
+      </if>
+      <if test="errorParam != null">
+        #{errorParam,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanErrorLog">
+    update tab_haoban_error_log
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      </if>
+      <if test="moduleDesc != null">
+        module_desc = #{moduleDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="errorDesc != null">
+        error_desc = #{errorDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="errorFlagId != null">
+        error_flag_id = #{errorFlagId,jdbcType=VARCHAR},
+      </if>
+      <if test="errorParam != null">
+        error_param = #{errorParam,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanErrorLog">
+    update tab_haoban_error_log
+    set enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      module_desc = #{moduleDesc,jdbcType=VARCHAR},
+      error_desc = #{errorDesc,jdbcType=VARCHAR},
+      error_flag_id = #{errorFlagId,jdbcType=VARCHAR},
+      error_param = #{errorParam,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

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

@@ -390,6 +390,7 @@
 
   <select id="listMemberStaffRel" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
     select ecr.member_id  as memberId,
+           ecr.external_user_id as memberExternalUserId,
            scr.wx_user_id as staffWxUserId,
            scr.clerk_id as staffClerkId
     from (select staff_id,
@@ -414,6 +415,7 @@
 
     <select id="listMemberStaffRelNew" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
         select ecr.member_id  as memberId,
+        ecr.external_user_id as memberExternalUserId,
         scr.wx_open_user_id as staffWxUserId,
         scr.clerk_id as staffClerkId
         from (select a.staff_id,

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

+import com.gic.haoban.manage.service.entity.TabHaobanErrorLog;
+import com.gic.haoban.manage.service.service.ErrorLogService;
+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;
+
+/**
+ * desc：
+ *
+ * @author: YongEn
+ * @date: 2022/1/18
+ **/
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
+public class ErrorLogTest {
+
+    @Autowired
+    private ErrorLogService errorLogService;
+
+    @Test
+    public void testSave() {
+        TabHaobanErrorLog errorLog = new TabHaobanErrorLog();
+        errorLog.setEnterpriseId("123123");
+        errorLog.setModuleDesc("haoban-manage3-service");
+        errorLog.setErrorDesc("测试错误");
+        errorLog.setErrorFlagId("123123");
+        errorLog.setErrorParam("{123,123}");
+        errorLog.setRemark("123123");
+        errorLogService.save(errorLog);
+    }
+
+}

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

@@ -75,16 +75,23 @@ public class ServiceTest {
 
     @Test
     public void test11() {
-        PendingTaskQDTO pendingTaskDTO = new PendingTaskQDTO();
-        pendingTaskDTO.setRelationId("relatrionId");
-        pendingTaskDTO.setTaskType(1 == TaskTypeEnum.TEL.getValue() ? PendingTaskTypeEnum.TEL_TASK.getType() : PendingTaskTypeEnum.PERFORMANCE.getType());
-        pendingTaskDTO.setTitle("标题");
-        pendingTaskDTO.setDescription("内容");
-        pendingTaskDTO.setStoreId("storeId");
-        pendingTaskDTO.setClerkId("clerkId");
-        pendingTaskDTO.setEnterpriseId("eid");
-        pendingTaskDTO.setOverdueTime(new Date());
-        pendingTaskApiService.addPendingTask(pendingTaskDTO);
+        List<PendingTaskQDTO> list=new ArrayList<>();
+        int i=310;
+        while (i-->0)
+        {
+            PendingTaskQDTO pendingTaskDTO = new PendingTaskQDTO();
+            pendingTaskDTO.setRelationId("relatrionId"+i);
+            pendingTaskDTO.setTaskType(1 == TaskTypeEnum.TEL.getValue() ? PendingTaskTypeEnum.TEL_TASK.getType() : PendingTaskTypeEnum.PERFORMANCE.getType());
+            pendingTaskDTO.setTitle("标题");
+            pendingTaskDTO.setDescription("内容");
+            pendingTaskDTO.setStoreId("storeId");
+            pendingTaskDTO.setClerkId("clerkId");
+            pendingTaskDTO.setEnterpriseId("eid");
+            pendingTaskDTO.setOverdueTime(new Date());
+            pendingTaskDTO.setInvalidTime(new Date());
+            list.add(pendingTaskDTO);
+        }
+        pendingTaskApiService.addPendingTaskBatch(list);
     }
 
     @Test

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

+import com.gic.haoban.base.api.common.AppJSONField;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class TestQo implements Serializable {
+    private String id;
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

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

@@ -6,8 +6,11 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.cache.impl.TimedCache;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -15,16 +18,35 @@ import org.apache.commons.lang3.time.DateUtils;
 
 
 public class test {
+    private static final TimedCache<String, TestQo> cache = CacheUtil.newTimedCache(3000L);
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         Date date = new Date();
         Date tomrrow = DateUtils.addDays(date, 1);
         Date yestory = DateUtils.addDays(date, -1);
         long l = DateUtil.betweenDay(tomrrow, date, true);
 
         long l2 = DateUtil.betweenDay(date, tomrrow, true);
-
+        TestQo qo=new TestQo();
+        qo.setName("test");
         System.out.println(l + "=" + l2);
+
+        cache.put("test",qo);
+        Thread.sleep(1000L);
+        TestQo test = cache.get("test");
+        System.out.println(JSONObject.toJSONString(test));
+
+        Thread.sleep(2000L);
+        System.out.println(JSONObject.toJSONString(test));
+        Thread.sleep(2000L);
+        System.out.println(JSONObject.toJSONString(test));
+        test = cache.get("test");
+        System.out.println(JSONObject.toJSONString(test));
+
+        int i=20;
+        while (i-->0) {
+            Thread.sleep(2000L);
+        }
 //        String key = "3.2.1";
 //        String[] split = key.split(".");
 //

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

@@ -676,7 +676,6 @@ public class ClerkController extends WebBaseController {
     /**
      * 未关联导购列表
      *
-     * @param keyword
      * @param wxEnterpriseId
      * @param staffId
      * @return
@@ -1174,11 +1173,11 @@ public class ClerkController extends WebBaseController {
      */
     @RequestMapping("customer-info")
     @IgnoreLogin
-    public HaobanResponse customerInfo(@RequestBody @Valid CommonQO qo) {
+    public RestResponse customerInfo(@RequestBody @Valid CommonQO qo) {
         CustomerFriendMemberVO ret = new CustomerFriendMemberVO();
         StaffDTO staffDTO = staffApiService.selectById(qo.getStaffId());
         if (staffDTO == null) {
-            return resultResponse(HaoBanErrCode.ERR_6);
+            return RestResponse.failure(HaoBanErrCode.ERR_6.getCode()+"",HaoBanErrCode.ERR_6.getMsg());
         }
         int friendCount = externalClerkRelatedApiService.countFriendCountByClerkId(qo.getWxEnterpriseId(), qo.getEnterpriseId(), staffDTO.getWxUserId(), qo.getClerkId());
         int memberCount = customerApiService.countMember(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
@@ -1186,7 +1185,7 @@ public class ClerkController extends WebBaseController {
         ret.setFriendCount(friendCount);
         ret.setMemberCount(memberCount);
 
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return RestResponse.successResult(ret);
     }
 
     /**
@@ -1196,10 +1195,10 @@ public class ClerkController extends WebBaseController {
      */
     @RequestMapping("can-relation-count")
     @IgnoreLogin
-    public HaobanResponse canRelationCount(@RequestBody @Valid CommonQO qo) {
+    public RestResponse canRelationCount(@RequestBody @Valid CommonQO qo) {
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(qo.getWxEnterpriseId());
         if (list == null || list.isEmpty()) {
-            return resultResponse(HaoBanErrCode.ERR_1);
+            return RestResponse.successResult();
         }
         List<String> enterpriseIdList = list.stream().filter(s -> {
             boolean over = isEnterpriseOver(s.getEnterpriseId());
@@ -1208,7 +1207,7 @@ public class ClerkController extends WebBaseController {
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(qo.getWxEnterpriseId());
         List<ClerkDTO> clerkList = this.getUnbindClerkList(enterpriseIdList, storeIds, qo.getStaffId());
 
-        return resultResponse(HaoBanErrCode.ERR_1, clerkList.size());
+        return RestResponse.successResult(clerkList.size());
     }
 
 

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.web.qo.PageQo;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
@@ -50,7 +51,7 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/commission/list")
-    public HaobanResponse pendingList(@RequestBody @Valid PendingListQO qo) {
+    public RestResponse pendingList(@RequestBody @Valid PendingListQO qo) {
         PendingListQDTO pendingListQDTO = EntityUtil.changeEntityByOrika(PendingListQDTO.class, qo);
         pendingListQDTO.setFinishFlag(0);
         pendingListQDTO.setOverdueFlag(0);
@@ -63,7 +64,7 @@ public class NotifyController extends WebBaseController {
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
 
         PageResult2 pageInfo = PageUtil.getPageInfo(retPage.getResult());
-        return resultResponse(HaoBanErrCode.ERR_1, pageInfo);
+        return RestResponse.successResult(pageInfo);
     }
 
     /**
@@ -72,10 +73,10 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/commission/today-list")
-    public HaobanResponse pendingToday(@RequestBody @Valid CommonQO qo) {
+    public RestResponse pendingToday(@RequestBody @Valid CommonQO qo) {
         ServiceResponse<List<PendingTaskDetailDTO>> response = pendingTaskApiService
                 .listPendingTaskToday(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId(), false);
-        return resultResponse(HaoBanErrCode.ERR_1, response.getResult());
+        return RestResponse.successResult(response.getResult());
     }
 
 
@@ -85,7 +86,7 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/commission/filter-info")
-    public HaobanResponse filterInfo(@RequestBody @Valid CommonQO qo) {
+    public RestResponse filterInfo(@RequestBody @Valid CommonQO qo) {
         Map<String, Object> ret = new HashMap<String, Object>();
 
         List<PairValVO> taskTypes = new ArrayList<PairValVO>();
@@ -112,7 +113,7 @@ public class NotifyController extends WebBaseController {
         ret.put("taskTypes", taskTypes);
         ret.put("filter", filter);
 
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return RestResponse.successResult(ret);
     }
 
 
@@ -122,9 +123,9 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/list")
-    public HaobanResponse list(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse list(@RequestBody @Valid MessageListQO qo) {
         ServiceResponse<Page<NoticeMessageInfoDTO>> retPage = noticeMessageService.pageNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId(), qo.getCategoryType(), qo.getBasePageInfo());
-        return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(retPage.getResult()));
+        return RestResponse.successResult(PageUtil.getPageInfo(retPage.getResult()));
     }
 
     /**
@@ -133,12 +134,12 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/read")
-    public HaobanResponse readSingle(Long noticeMessageId) {
+    public RestResponse readSingle(Long noticeMessageId) {
         if (noticeMessageId == null) {
-            return resultResponse(HaoBanErrCode.ERR_2);
+            return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"",HaoBanErrCode.ERR_2.getMsg());
         }
         noticeMessageService.updateReadFlagById(noticeMessageId);
-        return resultResponse(HaoBanErrCode.ERR_1);
+        return RestResponse.successResult();
     }
 
     /**
@@ -147,9 +148,9 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/all-read")
-    public HaobanResponse readAll(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse readAll(@RequestBody @Valid MessageListQO qo) {
         noticeMessageService.updateWriteFlagByClerkId(qo.getEnterpriseId(), qo.getClerkId(), qo.getCategoryType());
-        return resultResponse(HaoBanErrCode.ERR_1);
+        return RestResponse.successResult();
     }
 
     /**
@@ -158,7 +159,7 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/category")
-    public HaobanResponse category(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse category(@RequestBody @Valid MessageListQO qo) {
         List<PairValVO> ret = new ArrayList<PairValVO>();
         NoticeMessageCategoryTypeEnum[] values = NoticeMessageCategoryTypeEnum.values();
         for (NoticeMessageCategoryTypeEnum val : values) {
@@ -167,7 +168,7 @@ public class NotifyController extends WebBaseController {
             vo.setName(val.getName());
             ret.add(vo);
         }
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return RestResponse.successResult(ret);
     }
 
 
@@ -177,9 +178,9 @@ public class NotifyController extends WebBaseController {
      * @return
      */
     @RequestMapping("/message/count")
-    public HaobanResponse messageCount(@RequestBody @Valid MessageListQO qo) {
+    public RestResponse messageCount(@RequestBody @Valid MessageListQO qo) {
         ServiceResponse<Integer> ret = noticeMessageService.countUnReadNoticeMessage(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
-        return resultResponse(HaoBanErrCode.ERR_1, ret.getResult());
+        return RestResponse.successResult(ret.getResult());
     }