单向好友

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java

 package com.gic.haoban.manage.api.dto.qdto.hm;
 
 import java.io.Serializable;
+import java.util.Date;
 
 public class WxUserAddLogQDTO implements Serializable{
 
@@ -20,6 +21,15 @@ public class WxUserAddLogQDTO implements Serializable{
     private String staffName;
     private String clerkId;
     private Integer addWay ;
+    private Date qwAddTime ;
+
+    public Date getQwAddTime() {
+        return qwAddTime;
+    }
+
+    public void setQwAddTime(Date qwAddTime) {
+        this.qwAddTime = qwAddTime;
+    }
 
     public Integer getAddWay() {
         return addWay;

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

 package com.gic.haoban.manage.service.entity.hm;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 
@@ -58,6 +59,15 @@ public class TabWxUserAddLog implements Serializable {
     private java.util.Date updateTime;
     /**是否所有好友删除 1是0否*/
     private Integer allDelFlag;
+    private Date qwAddTime ;
+
+    public Date getQwAddTime() {
+        return qwAddTime;
+    }
+
+    public void setQwAddTime(Date qwAddTime) {
+        this.qwAddTime = qwAddTime;
+    }
 
     public void setLogId(Long logId) {
         this.logId = logId;

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

@@ -147,6 +147,7 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                     entity = this.addMemberInfo(qdto.getEnterpriseId(), qdto.getMemberId(), entity);
                 }
             }
+            entity.setQwAddTime(qdto.getQwAddTime());
             this.wxUserAddLogMapper.insert(entity);
         }catch(Exception e) {
             log.info("异常",e);

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

@@ -167,6 +167,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         wxUserAddLogQDTO.setExternalUserid(related.getExternalUserId());
         wxUserAddLogQDTO.setStaffId(related.getStaffId());
         wxUserAddLogQDTO.setClerkId(related.getClerkId());
+        if(null != related.getAddTime()) {
+            wxUserAddLogQDTO.setQwAddTime(new Date(related.getAddTime()*1000));
+        }
         wxUserAddLogService.save(wxUserAddLogQDTO);
         //定制
         addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);

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

@@ -247,6 +247,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         wxUserAddLogQDTO.setStaffId(related.getStaffId());
         wxUserAddLogQDTO.setClerkId(related.getClerkId());
         wxUserAddLogQDTO.setDelClerkFlag(true);
+        if(null != related.getAddTime()) {
+            wxUserAddLogQDTO.setQwAddTime(new Date(related.getAddTime()*1000));
+        }
         wxUserAddLogService.save(wxUserAddLogQDTO);
 
         addDelFriendEvent(related.getUnionid(), related.getClerkId(), wxEnterpriseId, enterpriseId, related.getMemberId(), related.getStoreId(), 0);
@@ -658,6 +661,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
        wxUserAddLogQDTO.setStaffName(staffName);
        wxUserAddLogQDTO.setClerkId(hyClerkId);
        wxUserAddLogQDTO.setAddWay(dto.getAddWay());
+       if(StringUtils.isNotBlank(dto.getAddCreateTime())) {
+           wxUserAddLogQDTO.setQwAddTime(new Date(Long.valueOf(createTime)*1000));
+       }
        this.wxUserAddLogService.save(wxUserAddLogQDTO);
        RedisUtil.unlock(lockKey);
        if(StringUtils.isNotBlank(memberId)) {

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

@@ -313,7 +313,7 @@
         from tab_haoban_external_clerk_related
         where staff_id = #{staffId,jdbcType=VARCHAR}
         and external_user_id = #{externalUserid}
-        and status_flag = #{statusFlag}
+        and status_flag = #{statusFlag} order by update_time desc
     </select>
 
 

haoban-manage3-service/src/main/resources/mapper/hm/WxUserAddLogMapper.xml

@@ -34,6 +34,7 @@
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="all_del_flag" property="allDelFlag"/>
+        <result column="qw_add_time" property="qwAddTime" />
     </resultMap>
     <sql id="Base_Column_List">
         log_id ,
@@ -66,7 +67,7 @@
 		member_label_name,
 		create_time,
 		update_time,
-		all_del_flag
+		all_del_flag , qw_add_time
     </sql>
     <!-- ===================== 新增 ======================== -->
     <insert id="insert"
@@ -103,7 +104,7 @@
                                                create_time,
                                                update_time,
                                                add_time,
-                                               all_del_flag)
+                                               all_del_flag , qw_add_time)
         VALUES (#{logId,jdbcType=BIGINT},
                 #{wxEnterpriseId,jdbcType=VARCHAR},
                 #{enterpriseId,jdbcType=CHAR},
@@ -135,7 +136,7 @@
                 now(),
                 now(),
                 now(),
-                #{allDelFlag,jdbcType=INTEGER})
+                #{allDelFlag,jdbcType=INTEGER} , #{qwAddTime})
         ]]>
 	</insert>