wx_user_id调整

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

@@ -155,11 +155,10 @@ public class TestController extends WebBaseController {
                 continue;
             }
             String wxEnterpriseId = staff.getWxEnterpriseId();
-            String wxUserId = staff.getWxUserId();
             String taskName = "刷新企业微信好友（" + staff.getStaffName() + "）";
             String taskId = dealSyncOperationApiService.createWxFriendTaskSingle(staff.getWxEnterpriseId(), taskName, staffId, staff.getStaffName(), SyncTaskTypeEnum.FRIEND_SINGLE.getType());
             if (StringUtils.isNotBlank(taskId)) {
-                dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, wxUserId, staffId, wxEnterpriseId);
+                dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
             }
         }
         return resultResponse(HaoBanErrCode.ERR_1);

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

@@ -9,21 +9,6 @@ import java.util.List;
 
 @Mapper
 public interface HandoverExternalMapper {
-    /**
-     */
-    int deleteByPrimaryKey(String handoverExternalId);
-
-    /**
-     */
-    int insert(TabHandoverExternal record);
-
-    /**
-     */
-    int insertSelective(TabHandoverExternal record);
-
-    /**
-     */
-    TabHandoverExternal selectByPrimaryKey(String handoverExternalId);
 
     /**
      */
@@ -31,10 +16,6 @@ public interface HandoverExternalMapper {
 
     /**
      */
-    int updateByPrimaryKey(TabHandoverExternal record);
-
-    /**
-     */
     int insertBatch(@Param("list") List<TabHandoverExternal> list);
 
     /**

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

@@ -72,7 +72,7 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
             logger.info("刷新好友失败或正在刷新：{},{}", staffId, storeId);
             return;
         }
-        dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staff.getWxUserId(), staffId, wxEnterpriseId);
+        dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
         logger.info("任务id：{}", taskId);
     }
 

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

@@ -86,9 +86,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     @Autowired
     private SecretSettingService secretSettingService;
 
-    @Autowired
-    private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
-
     private static final String LOCK_KEY = "sync_wx_lock_";
 
     private static final String LOCK_SUCCESS_KEY = "sync_wx_success_lock_";
@@ -615,13 +612,10 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
     @Override
     public void dealWxFriendClerk(String taskId, String wxEnterpriseId) {
-        //List<TabHaobanStaffClerkRelation> relationList = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
         List<TabHaobanStaff>  list = this.staffMapper.listByWxEnterpriseId(wxEnterpriseId) ;
-        List<TabHaobanClerkMainStoreRelated> mainStoreList = clerkMainStoreRelatedService.listByWxEnterpriseId(wxEnterpriseId);
-        Map<String, TabHaobanClerkMainStoreRelated> map = mainStoreList.stream().collect(Collectors.toMap(TabHaobanClerkMainStoreRelated::getStaffId, s -> s));
         List<TabHaobanPreDealLog> dealLogList = list.stream().map(dto -> {
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-            dealLog.setDataId(dto.getWxUserId());
+            dealLog.setDataId(dto.getStaffId());
             dealLog.setpDataId(dto.getStaffId());
             dealLog.setDataType(PreDealTypeEnum.friend_clerk.getVal());
             dealLog.setStatusFlag(0);

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

@@ -692,12 +692,12 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
             JSONObject midUser = followUser.getJSONObject(i);
             String wxUserId = midUser.getString("userid");
             //做兼容
-            TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+           /* TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
             if (staff != null) {
                 logger.info("旧wxUserId：{}", wxUserId);
                 wxUserId = staff.getWxUserId();
                 logger.info("新wxUserId：{}", wxUserId);
-            }
+            }*/
             Set<String> midTagIds = new HashSet<>();
             if (!midUser.containsKey("tags")) {
                 ret.put(wxUserId, midTagIds);

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

@@ -836,6 +836,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 
         //获取微信信息
         String wxUserId = staff.getWxUserId();
+        if(qwDTO.needOpenUserIdDk()) {
+            wxUserId = staff.getWxOpenUseId() ;
+        }
         UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
         if (null == user) {
             logger.info("企业微信用户不存在:wxEnterpriseId:{}:wxUserId:{}", wxEnterpriseId, wxUserId);

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

@@ -373,7 +373,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 remarkMap.put("dthmKey", dthmKey);
                 if (null != dthmKey) {
                     WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
-                    ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, qwDTO.getThirdCorpid(), retDTO);
+                    ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, qwDTO, retDTO);
                     if (!addResp.isSuccess()) {
                         remarkMap.put("sm", "创建动态活码失败,取单人活码");
                         if (StringUtils.isBlank(hm.getWxQrcode())) {
@@ -425,7 +425,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     }
 
     // 创建活码
-    private ServiceResponse<String> addQrcode(HmQrcodeBO hm, String key, String corpid, HmLinkWxaDTO retDTO) {
+    private ServiceResponse<String> addQrcode(HmQrcodeBO hm, String key, WxEnterpriseQwDTO qwDTO, HmLinkWxaDTO retDTO) {
         String limitQrcode = this.limitIp(hm);
         if (StringUtils.isNotEmpty(limitQrcode)) {
             return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "超限制数");
@@ -439,11 +439,15 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         paramsDTO.setState("DT" + key);
         TabHaobanStaff tabHaobanStaff = staffService.selectById(hm.getStaffId());
         if (tabHaobanStaff != null) {
+            if(qwDTO.needOpenUserId3th()) {
+                paramsDTO.setUser(Arrays.asList(tabHaobanStaff.getWxOpenUseId()));
+            }else {
                 paramsDTO.setUser(Arrays.asList(tabHaobanStaff.getWxUserId()));
             }
-        QywxExternalcontactResultDTO wxResp = qywxUserApiService.addContactWay(corpid, config.getWxSuiteid(),
+        }
+        QywxExternalcontactResultDTO wxResp = qywxUserApiService.addContactWay(qwDTO.getThirdCorpid(), config.getWxSuiteid(),
                 paramsDTO);
-        log.info("创建动态活码参数corpid={},app={},param={},返回={}", corpid, config.getWxSuiteid(), JSON.toJSONString(paramsDTO),
+        log.info("创建动态活码参数corpid={},app={},param={},返回={}", qwDTO.getThirdCorpid(), config.getWxSuiteid(), JSON.toJSONString(paramsDTO),
                 JSON.toJSONString(wxResp));
         if (null != wxResp && 0 == wxResp.getErrcode()) {
             retDTO.setHmQrcode(wxResp.getQr_code());
@@ -452,7 +456,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             qo.setWxConfigId(wxResp.getConfig_id());
             qo.setWxQrcode(wxResp.getQr_code());
             qo.setRelationId(key);
-            qo.setCorpid(corpid);
+            qo.setCorpid(qwDTO.getThirdCorpid());
             this.hmQrcodeTempService.save(qo);
             return ServiceResponse.success(wxResp.getQr_code());
         }

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

@@ -30,133 +30,7 @@
     haoban_friend_flag, external_head_url, status_flag, handover_transfer_id, takeover_time, 
     transfer_status, transfer_time, create_time, update_time
   </sql>
-    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_handover_external
-        where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from tab_haoban_handover_external
-    where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
-  </delete>
-    <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
-    insert into tab_haoban_handover_external (handover_external_id, wx_enterprise_id, 
-      staff_id, user_id, external_user_id, 
-      external_user_name,relation_id, haoban_friend_flag, external_head_url,
-      status_flag, handover_transfer_id, takeover_time, 
-      transfer_status, transfer_time, create_time, 
-      update_time)
-    values (#{handoverExternalId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, 
-      #{staffId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{externalUserId,jdbcType=VARCHAR}, 
-      #{externalUserName,jdbcType=VARCHAR},#{relationId}, #{haobanFriendFlag,jdbcType=INTEGER}, #{externalHeadUrl,jdbcType=VARCHAR},
-      #{statusFlag,jdbcType=INTEGER}, #{handoverTransferId,jdbcType=VARCHAR}, #{takeoverTime,jdbcType=TIMESTAMP}, 
-      #{transferStatus}, #{transferTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
-      #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
-        insert into tab_haoban_handover_external
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="handoverExternalId != null">
-                handover_external_id,
-            </if>
-            <if test="wxEnterpriseId != null">
-                wx_enterprise_id,
-            </if>
-            <if test="staffId != null">
-                staff_id,
-            </if>
-            <if test="userId != null">
-                user_id,
-            </if>
-            <if test="externalUserId != null">
-                external_user_id,
-            </if>
-            <if test="externalUserName != null">
-                external_user_name,
-            </if>
-            <if test="relationId != null">
-                relation_id,
-            </if>
-            <if test="haobanFriendFlag != null">
-                haoban_friend_flag,
-            </if>
-            <if test="externalHeadUrl != null">
-                external_head_url,
-            </if>
-            <if test="statusFlag != null">
-                status_flag,
-            </if>
-            <if test="handoverTransferId != null">
-                handover_transfer_id,
-            </if>
-            <if test="takeoverTime != null">
-                takeover_time,
-            </if>
-            <if test="transferStatus != null">
-                transfer_status,
-            </if>
-            <if test="transferTime != null">
-                transfer_time,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="handoverExternalId != null">
-                #{handoverExternalId,jdbcType=VARCHAR},
-            </if>
-            <if test="wxEnterpriseId != null">
-                #{wxEnterpriseId,jdbcType=VARCHAR},
-            </if>
-            <if test="staffId != null">
-                #{staffId,jdbcType=VARCHAR},
-            </if>
-            <if test="userId != null">
-                #{userId,jdbcType=VARCHAR},
-            </if>
-            <if test="externalUserId != null">
-                #{externalUserId,jdbcType=VARCHAR},
-            </if>
-            <if test="externalUserName != null">
-                #{externalUserName,jdbcType=VARCHAR},
-            </if>
-            <if test="relationId != null">
-                #{relationId,jdbcType=VARCHAR},
-            </if>
-            <if test="haobanFriendFlag != null">
-                #{haobanFriendFlag,jdbcType=INTEGER},
-            </if>
-            <if test="externalHeadUrl != null">
-                #{externalHeadUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="statusFlag != null">
-                #{statusFlag,jdbcType=INTEGER},
-            </if>
-            <if test="handoverTransferId != null">
-                #{handoverTransferId,jdbcType=VARCHAR},
-            </if>
-            <if test="takeoverTime != null">
-                #{takeoverTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="transferStatus != null">
-                #{transferStatus},
-            </if>
-            <if test="transferTime != null">
-                #{transferTime,jdbcType=TIMESTAMP},
-            </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.TabHandoverExternal">
         update tab_haoban_handover_external
         <set>
@@ -208,25 +82,6 @@
         </set>
         where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHandoverExternal">
-    update tab_haoban_handover_external
-    set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
-      staff_id = #{staffId,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=VARCHAR},
-      external_user_id = #{externalUserId,jdbcType=VARCHAR},
-      external_user_name = #{externalUserName,jdbcType=VARCHAR},
-      relation_id = #{relationId,jdbcType=VARCHAR},
-      haoban_friend_flag = #{haobanFriendFlag,jdbcType=INTEGER},
-      external_head_url = #{externalHeadUrl,jdbcType=VARCHAR},
-      status_flag = #{statusFlag,jdbcType=INTEGER},
-      handover_transfer_id = #{handoverTransferId,jdbcType=VARCHAR},
-      takeover_time = #{takeoverTime,jdbcType=TIMESTAMP},
-      transfer_status = #{transferStatus},
-      transfer_time = #{transferTime,jdbcType=TIMESTAMP},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where handover_external_id = #{handoverExternalId,jdbcType=VARCHAR}
-  </update>
 
     <insert id="insertBatch">
         insert into tab_haoban_handover_external (handover_external_id, wx_enterprise_id,

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

@@ -1225,6 +1225,9 @@ public class ClerkController extends WebBaseController {
             return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_400002.getMsg());
         }
         String wxUserId = staffDTO.getWxUserId();
+        if(qwDTO.needOpenUserId3th()) {
+            wxUserId = staffDTO.getWxOpenUseId() ;
+        }
         String openid = qywxUserApiService.getSelfOpenIdByUserId(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId);
         if (StringUtils.isBlank(openid)) {
             int code = HaoBanErrCode.ERR_600003.getCode();