Merge branch 'feature/xgh/7月零散' into 'developer'

离职继承欢迎语/删除判断是否单向好友

See merge request !2040

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

@@ -26,6 +26,17 @@ public class WxUserAddLogQDTO implements Serializable{
     private String friendStoreId ;
     // 0手动 1系统
     private int delType ;
+    // 删除时是否单向好友 1是0否
+    private int delIsSingle ;
+
+    public int getDelIsSingle() {
+        return delIsSingle;
+    }
+
+    public void setDelIsSingle(int delIsSingle) {
+        this.delIsSingle = delIsSingle;
+    }
+
 
     public int getDelType() {
         return delType;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/qdto/QueryWelcomeQDTO.java

@@ -23,6 +23,17 @@ public class QueryWelcomeQDTO extends BasePageInfo {
      */
     private Integer type;
 
+    // 发送场景 0无条件 1全部 2加好友 3继承
+    private int scene ;
+
+    public int getScene() {
+        return scene;
+    }
+
+    public void setScene(int scene) {
+        this.scene = scene;
+    }
+
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/qdto/SaveWelcomeQDTO.java

@@ -73,6 +73,16 @@ public class SaveWelcomeQDTO implements Serializable {
      */
     private Integer type;
 
+    private int scene = 1 ;
+
+    public int getScene() {
+        return scene;
+    }
+
+    public void setScene(int scene) {
+        this.scene = scene;
+    }
+
     public String getModifierId() {
         return modifierId;
     }

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

@@ -78,6 +78,17 @@ public class TabWelcome implements Serializable {
     private String modifierName ;
 
     private Integer type;
+
+    private int scene ;
+
+    public int getScene() {
+        return scene;
+    }
+
+    public void setScene(int scene) {
+        this.scene = scene;
+    }
+
     public String getModifierId() {
         return modifierId;
     }

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

@@ -64,6 +64,15 @@ public class TabWxUserAddLog implements Serializable {
     private String friendClerkId ;
     private String friendStoreId ;
     private int delType ;
+    private int delIsSingle ;
+
+    public int getDelIsSingle() {
+        return delIsSingle;
+    }
+
+    public void setDelIsSingle(int delIsSingle) {
+        this.delIsSingle = delIsSingle;
+    }
 
     public int getDelType() {
         return delType;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/welcome/SaveWelcomeBO.java

@@ -27,6 +27,8 @@ public class SaveWelcomeBO {
      * @see com.gic.haoban.manage.api.enums.hm.HmWelcomeType
      */
     private Integer type;
+
+    private int scene = 1 ;
     /**
      * 内容
      */
@@ -68,6 +70,14 @@ public class SaveWelcomeBO {
      */
     private List<WelcomeSuitStaffBO> suitStaffDeleteList;
 
+    public int getScene() {
+        return scene;
+    }
+
+    public void setScene(int scene) {
+        this.scene = scene;
+    }
+
     public String getModifierId() {
         return modifierId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/WelcomeInfoQO.java

@@ -18,6 +18,27 @@ public class WelcomeInfoQO extends BasePageInfo {
 
     private Integer type;
 
+    //1 正常加好友 2离职继承
+    private int sceneType ;
+
+    private int scene ;
+
+    public int getScene() {
+        return scene;
+    }
+
+    public void setScene(int scene) {
+        this.scene = scene;
+    }
+
+    public int getSceneType() {
+        return sceneType;
+    }
+
+    public void setSceneType(int sceneType) {
+        this.sceneType = sceneType;
+    }
+
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }

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

@@ -87,7 +87,8 @@ public interface WelcomeService {
      * @author : YongEn
      * @date : 2022/2/9
      */
-    WelcomeDetailBO getMatchWelcome(String staffId, String wxEnterpriseId);
+    WelcomeDetailBO getMatchWelcome(String staffId, String wxEnterpriseId,int welcomeScene);
+
 
     /**
      * desc: 新增默认欢迎语

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

@@ -151,6 +151,7 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
             entity.setFriendClerkId(qdto.getFriendClerkId());
             entity.setFriendStoreId(qdto.getFriendStoreId());
             entity.setDelType(qdto.getDelType());
+            entity.setDelIsSingle(qdto.getDelIsSingle());
             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

@@ -179,6 +179,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         if(autoDelNum>0) {
             wxUserAddLogQDTO.setDelType(1);
         }
+        if(related.getExternalStatus()==3) {
+            wxUserAddLogQDTO.setDelIsSingle(1) ;
+        }
         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/impl/WelcomeSendServiceImpl.java

@@ -143,16 +143,22 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
         String relationKey = SecureUtil.md5(staffId + externalUserId);
         WelcomeDetailBO welcomeBO = null;
         WelcomeUserInfoBO userBO = this.getExternalUserName(qwDTO, externalUserId , wxUserId);
+        int addWay = userBO.getAddWay() ;
+        int welcomeScene = 0 ;
+        if(addWay==202) {
+            // 离职继承、在职继承
+            welcomeScene = 202 ;
+        }
         if (StringUtils.isNotBlank(state)
                 && (state.startsWith(Manage3Constants.HM) || state.startsWith(Manage3Constants.DT))) {
             WelcomeReferBO welcomeReferBo = getWelcomeReferBo(state);
             welcomeBO = welcomeService.getMatchWelcomeWithReferId(staffId, wxEnterpriseId, welcomeReferBo);
             //单人活码欢迎语未配置时，取欢迎语的配置进行发送
             if(state.startsWith(Manage3Constants.HM) && welcomeBO == null){
-                welcomeBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId);
+                welcomeBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId,welcomeScene);
             }
         } else {
-            welcomeBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId);
+            welcomeBO = welcomeService.getMatchWelcome(staffId, wxEnterpriseId,welcomeScene);
         }
         if (Objects.isNull(welcomeBO)) {
             log.info("活码欢迎语未配置wxEnterpriseId:{}", wxEnterpriseId);

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

@@ -205,6 +205,7 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcome.setModifierName(bo.getModifierName());
         welcome.setDefaultWelcomeFlag(bo.getDefaultWelcomeFlag());
         welcome.setType(bo.getType());
+        welcome.setScene(bo.getScene());
         welcomeMapper.insert(welcome);
         return welcome;
     }
@@ -460,21 +461,24 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     @Override
-    public WelcomeDetailBO getMatchWelcome(String staffId, String wxEnterpriseId) {
+    public WelcomeDetailBO getMatchWelcome(String staffId, String wxEnterpriseId,int welcomeScene) {
         if (StringUtils.isEmpty(staffId) || StringUtils.isEmpty(wxEnterpriseId)) {
             return null;
         }
-        return queryMatchWelcome(staffId, wxEnterpriseId, HmWelcomeType.NORMAL.getCode());
+        return queryMatchWelcome(staffId, wxEnterpriseId, HmWelcomeType.NORMAL.getCode() ,welcomeScene);
     }
 
-    private WelcomeDetailBO queryMatchWelcome(String staffId, String wxEnterpriseId, Integer type) {
+    private WelcomeDetailBO queryMatchWelcome(String staffId, String wxEnterpriseId, Integer type , int welcomeScene) {
         WelcomeInfoQO welcomeInfoQO = new WelcomeInfoQO();
         welcomeInfoQO.setWxEnterpriseId(wxEnterpriseId);
         welcomeInfoQO.setType(type);
         // 查询非默认欢迎语
         welcomeInfoQO.setDefaultWelcomeFlag(0);
+        logger.info("发送场景={}",welcomeScene);
+        welcomeInfoQO.setSceneType(welcomeScene);
         List<TabWelcome> nonDefaultWelcomList = welcomeMapper.queryWelcomeList(welcomeInfoQO);
         // 查询默认欢迎语
+        welcomeInfoQO.setSceneType(0);
         welcomeInfoQO.setDefaultWelcomeFlag(1);
         List<TabWelcome> defaultWelcomeList = welcomeMapper.queryWelcomeList(welcomeInfoQO);
         if (CollectionUtils.isEmpty(nonDefaultWelcomList)) {
@@ -692,6 +696,7 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcomeInfoQo.setWxEnterpriseId(queryWelcomeQDTO.getWxEnterpriseId());
         welcomeInfoQo.setTitle(queryWelcomeQDTO.getTitle());
         welcomeInfoQo.setType(queryWelcomeQDTO.getType());
+        welcomeInfoQo.setScene(queryWelcomeQDTO.getScene());
         PageHelper.startPage(queryWelcomeQDTO.getPageNum(), queryWelcomeQDTO.getPageSize());
         com.github.pagehelper.Page<TabWelcome> tabWelcomes =
                 (com.github.pagehelper.Page<TabWelcome>) welcomeMapper.queryWelcomeList(welcomeInfoQo);

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

@@ -62,6 +62,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         saveWelcomeBO.setModifierId(qdto.getModifierId());
         saveWelcomeBO.setModifierName(qdto.getModifierName());
         saveWelcomeBO.setType(qdto.getType());
+        saveWelcomeBO.setScene(qdto.getScene());
         // 媒体列表
         saveWelcomeBO.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getWelcomeMediaList()));
         // 适用部门新增列表

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

@@ -24,7 +24,7 @@
     <sql id="Base_Column_List">
         welcome_id
         , wx_enterprise_id, title, welcome_content,welcome_img,open_flag, status_flag,
-        create_time, update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name , modifier_id , modifier_name, `type`
+        create_time, update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name , modifier_id , modifier_name, `type` , scene
     </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -43,7 +43,7 @@
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
         insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title,
                                         welcome_content, welcome_img, open_flag, status_flag, create_time,
-                                        update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name,modifier_id,modifier_name, `type`)
+                                        update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name,modifier_id,modifier_name, `type` , scene)
         values (#{welcomeId,jdbcType=VARCHAR},
                 #{wxEnterpriseId,jdbcType=VARCHAR},
                 #{title,jdbcType=VARCHAR},
@@ -56,7 +56,7 @@
                 #{operatorId,jdbcType=VARCHAR},
                 #{operatorName,jdbcType=VARCHAR},
                 #{defaultWelcomeFlag,jdbcType=INTEGER} , #{creatorId} , #{creatorName} , #{modifierId} , #{modifierName},
-                #{type}
+                #{type} , #{scene}
                 )
     </insert>
 
@@ -100,7 +100,10 @@
                 modifier_name = #{modifierName},
             </if>
             <if test="type != null">
-                `type` = #{type}
+                `type` = #{type} ,
+            </if>
+            <if test="scene !=0 ">
+                scene = #{scene} ,
             </if>
         </set>
         where welcome_id = #{welcomeId,jdbcType=VARCHAR}
@@ -162,6 +165,15 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+            <if test="scene>0">
+                and scene = #{scene}
+            </if>
+            <if test="sceneType==1">
+                and scene in (1,2)
+            </if>
+            <if test="sceneType==2">
+                and scene in (1,3)
+            </if>
         </where>
         order by update_time desc
     </select>

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

@@ -106,7 +106,7 @@
                                                create_time,
                                                update_time,
                                                add_time,
-                                               all_del_flag , qw_add_time , friend_clerk_id , friend_store_id , del_type )
+                                               all_del_flag , qw_add_time , friend_clerk_id , friend_store_id , del_type , del_is_single)
         VALUES (#{logId,jdbcType=BIGINT},
                 #{wxEnterpriseId,jdbcType=VARCHAR},
                 #{enterpriseId,jdbcType=CHAR},
@@ -138,7 +138,7 @@
                 now(),
                 now(),
                 now(),
-                #{allDelFlag,jdbcType=INTEGER} , #{qwAddTime} , #{friendClerkId} , #{friendStoreId} , #{delType})
+                #{allDelFlag,jdbcType=INTEGER} , #{qwAddTime} , #{friendClerkId} , #{friendStoreId} , #{delType} , #{delIsSingle})
         ]]>
 	</insert>