修复导购删除bug和导购重复bug

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

@@ -14,122 +14,133 @@ public interface StaffMapper {
 
     TabHaobanStaff selectByPrimaryKey(String staffId);
 
-	int updateByPrimaryKeySelective(TabHaobanStaff record);
-
-	TabHaobanStaff selectByNationcodeAndPhoneNumber(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("nationCode") String nationcode, @Param("phoneNumber") String phoneNumber);
-
-	List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds);
-
-	List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId);
-
-	List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName);
-
-	Page<TabHaobanStaff> pageStaff(@Param("staffIds") Set<String> staffIds, @Param("activeFlag") Integer activeFlag, @Param("keyword") String keyword);
-
-	/**
-	 * 选择用户id和企业标识
-	 *
-	 * @param userId         用户id
-	 * @param wxEnterpriseId wx企业标识
-	 * @return {@link TabHaobanStaff }
-	 * @author mozhu
-	 * @date 2022-01-13 15:05:28
-	 */
-	TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,
-												 @Param("wxEnterpriseId") String wxEnterpriseId);
-
-	TabHaobanStaff selectSuperByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
-
-	List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
-
-	List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds") List<String> userIds, @Param("wxEnterpriseId") String wxEnterpriseId);
-
-	int cleanStaff(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
-
-	TabHaobanStaff getWxStaffByOne(@Param("wxEnterpriseId") String wxEnterpriseId);
-
-	List<String> listUserStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
-
-	List<TabHaobanStaff> listNoStatusStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
-
-	TabHaobanStaff getNoStatusByWxUserIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId);
-
-	/**
-	 * 通过开放用户id和wx企业id列表
-	 *
-	 * @param openUserIds    开放的用户id
-	 * @param wxEnterpriseId wx企业标识
-	 * @return {@link List<TabHaobanStaff> }
-	 * @author mozhu
-	 * @date 2021-12-21 16:35:35
-	 */
-	List<TabHaobanStaff> listByOpenUserIdsAndWxEnterpriseId(@Param("openUserIds") List<String> openUserIds,
-															@Param("wxEnterpriseId") String wxEnterpriseId);
-
-	/**
-	 * 用户id wx企业id列表
-	 *
-	 * @param wxEnterpriseId wx企业标识
-	 * @return {@link List<String> }
-	 * @author mozhu
-	 * @date 2021-12-21 17:05:58
-	 */
-	List<TabHaobanStaff> listUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
-
-
-	/**
-	 * 更新开放用户id,用户id
-	 *
-	 * @param wxEnterpriseId wx企业标识
-	 * @param wxUserId       wx用户id
-	 * @param wxOpenUseId    开放的用户id
-	 * @return int
-	 * @author mozhu
-	 * @date 2021-12-21 17:17:51
-	 */
-	int updateOpenUserIdsByUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
-								  @Param("wxUserId") String wxUserId,
-								  @Param("wxOpenUseId") String wxOpenUseId);
-
-	/**
-	 * 选择通过打开用户id和企业标识
-	 *
-	 * @param wxOpenUseId    wx开放使用id
-	 * @param wxEnterpriseId wx企业标识
-	 * @return {@link TabHaobanStaff }
-	 * @author mozhu
-	 * @date 2021-12-21 21:13:56
-	 */
-	TabHaobanStaff selectByOpenUserIdAndEnterpriseId(@Param("wxOpenUseId") String wxOpenUseId,
-													 @Param("wxEnterpriseId") String wxEnterpriseId);
-
-	/**
-	 * 更新开放id员工id
-	 *
-	 * @param staffId 员工id
-	 * @param openId  开放id
-	 * @return int
-	 */
-	int updateOpenIdByStaffId(@Param("staffId") String staffId, @Param("openId") String openId);
-
-	/**
-	 * 更新二维码通过员工id
-	 *
-	 * @param staffId 员工id
-	 * @param qrCode  二维码
-	 * @return int
-	 */
-	int updateQrCodeByStaffId(@Param("staffId") String staffId, @Param("qrCode") String qrCode);
-
-	/**
-	 * 选择电话号码和企业标识
-	 *
-	 * @param phoneNumber    电话号码
-	 * @param wxEnterpriseId wx企业标识
-	 * @return {@link TabHaobanStaff }
-	 * @author mozhu
-	 * @date 2022-01-12 17:20:16
-	 */
-	TabHaobanStaff selectByPhoneNumberAndEnterpriseId(@Param("phoneNumber") String phoneNumber,
-													  @Param("wxEnterpriseId") String wxEnterpriseId);
+    int updateByPrimaryKeySelective(TabHaobanStaff record);
+
+    TabHaobanStaff selectByNationcodeAndPhoneNumber(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("nationCode") String nationcode, @Param("phoneNumber") String phoneNumber);
+
+    List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds);
+
+    List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId);
+
+    List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName);
+
+    Page<TabHaobanStaff> pageStaff(@Param("staffIds") Set<String> staffIds, @Param("activeFlag") Integer activeFlag, @Param("keyword") String keyword);
+
+    /**
+     * 选择用户id和企业标识
+     *
+     * @param userId         用户id
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link TabHaobanStaff }
+     * @author mozhu
+     * @date 2022-01-13 15:05:28
+     */
+    TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,
+                                                 @Param("wxEnterpriseId") String wxEnterpriseId);
+
+    TabHaobanStaff selectSuperByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+    List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
+
+    List<TabHaobanStaff> listByUserIdsAndWxEnterpriseId(@Param("userIds") List<String> userIds, @Param("wxEnterpriseId") String wxEnterpriseId);
+
+    int cleanStaff(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
+
+    TabHaobanStaff getWxStaffByOne(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+    List<String> listUserStaffId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
+
+    List<TabHaobanStaff> listNoStatusStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("staffIds") List<String> staffIds);
+
+    TabHaobanStaff getNoStatusByWxUserIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId);
+
+    /**
+     * 通过开放用户id和wx企业id列表
+     *
+     * @param openUserIds    开放的用户id
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link List<TabHaobanStaff> }
+     * @author mozhu
+     * @date 2021-12-21 16:35:35
+     */
+    List<TabHaobanStaff> listByOpenUserIdsAndWxEnterpriseId(@Param("openUserIds") List<String> openUserIds,
+                                                            @Param("wxEnterpriseId") String wxEnterpriseId);
+
+    /**
+     * 用户id wx企业id列表
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link List<String> }
+     * @author mozhu
+     * @date 2021-12-21 17:05:58
+     */
+    List<TabHaobanStaff> listUserIdByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+
+    /**
+     * 更新开放用户id,用户id
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param wxUserId       wx用户id
+     * @param wxOpenUseId    开放的用户id
+     * @return int
+     * @author mozhu
+     * @date 2021-12-21 17:17:51
+     */
+    int updateOpenUserIdsByUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
+                                  @Param("wxUserId") String wxUserId,
+                                  @Param("wxOpenUseId") String wxOpenUseId);
+
+    /**
+     * 选择通过打开用户id和企业标识
+     *
+     * @param wxOpenUseId    wx开放使用id
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link TabHaobanStaff }
+     * @author mozhu
+     * @date 2021-12-21 21:13:56
+     */
+    TabHaobanStaff selectByOpenUserIdAndEnterpriseId(@Param("wxOpenUseId") String wxOpenUseId,
+                                                     @Param("wxEnterpriseId") String wxEnterpriseId);
+
+    /**
+     * 更新开放id员工id
+     *
+     * @param staffId 员工id
+     * @param openId  开放id
+     * @return int
+     */
+    int updateOpenIdByStaffId(@Param("staffId") String staffId, @Param("openId") String openId);
+
+    /**
+     * 更新二维码通过员工id
+     *
+     * @param staffId 员工id
+     * @param qrCode  二维码
+     * @return int
+     */
+    int updateQrCodeByStaffId(@Param("staffId") String staffId, @Param("qrCode") String qrCode);
+
+    /**
+     * 选择电话号码和企业标识
+     *
+     * @param phoneNumber    电话号码
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link TabHaobanStaff }
+     * @author mozhu
+     * @date 2022-01-12 17:20:16
+     */
+    TabHaobanStaff selectByPhoneNumberAndEnterpriseId(@Param("phoneNumber") String phoneNumber,
+                                                      @Param("wxEnterpriseId") String wxEnterpriseId);
+
+    /**
+     * 删除同wxUserId的其他staff
+     *
+     * @param wxUserId       微信用户id
+     * @param staffId        导购id
+     * @param wxEnterpriseId wx企业标识
+     */
+    void delOtherStaffByWxUserId(@Param("wxUserId") String wxUserId,
+                                 @Param("staffId") String staffId,
+                                 @Param("wxEnterpriseId") String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -97,5 +97,12 @@ public interface StaffService {
      */
     int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId);
 
-
+    /**
+     * 删除同wxUserId的其他staff
+     *
+     * @param wxUserId       微信用户id
+     * @param staffId        导购id
+     * @param wxEnterpriseId wx企业标识
+     */
+    void delOtherStaffByWxUserId(String wxUserId, String staffId, String wxEnterpriseId);
 }

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

@@ -120,4 +120,9 @@ public class StaffServiceImpl implements StaffService {
         return mapper.updateOpenUserIdsByUserId(wxEnterpriseId, wxUserId, wxOpenUseId);
     }
 
+    @Override
+    public void delOtherStaffByWxUserId(String wxUserId, String staffId, String wxEnterpriseId) {
+        mapper.delOtherStaffByWxUserId(wxUserId, staffId, wxEnterpriseId);
+    }
+
 }

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

@@ -390,6 +390,9 @@ public class StaffApiServiceImpl implements StaffApiService {
         String nationCode = arr[0];
         String phoneNumber = arr[1];
         TabHaobanStaff staff = staffService.selectByPhoneNumberAndEnterpriseId(phoneNumber.trim(), wxEnterpriseId);
+        if (staff != null){
+            staffService.delOtherStaffByWxUserId(staff.getWxUserId(),staff.getStaffId(), wxEnterpriseId);
+        }
         staff = (staff == null ? new TabHaobanStaff() : staff);
         staff.setWxUserId(userId);
         staff.setUpdateTime(new Date());

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

@@ -42,6 +42,15 @@
         where staff_id = #{staffId,jdbcType=VARCHAR}
     </delete>
 
+    <update id="delOtherStaffByWxUserId">
+        update tab_haoban_staff
+        set status_flag = 0,update_time = now()
+        where wx_enterprise_id = #{wxEnterpriseId}
+          and wx_user_id = #{wxUserId}
+          and status_flag = 1
+          and staff_id != #{staffId}
+    </update>
+
     <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaff">
         insert into tab_haoban_staff
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -122,7 +122,7 @@ public class ClerkController extends WebBaseController {
                 resultList.add(dto);
             }
         }
-        return resultResponse(HaoBanErrCode.ERR_1, resultlist);
+        return resultResponse(HaoBanErrCode.ERR_1, resultList);
 
     }