Skip to content

H
haoban-manage3.0
Commit c4db91f6 by yaosai
Options

修复群发返回错误信息

parent fbedf0c7
Showing with 182 additions and 126 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java
......@@ -14,122 +14,144 @@ 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);
/**
* 删除同微信用户id的其他导购
*
* @param wxEnterpriseId 微信企业id
* @param wxUserId 微信用户id
* @param staffId 导购id
*/
void delStaffByWxUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxUserId") String wxUserId,
@Param("staffId") String staffId);
/**
* 删除同手机号的其他导购
*
* @param wxEnterpriseId 微信企业id
* @param phoneNumber 手机号
* @param staffId 导购id
*/
void delStaffByPhoneNumber(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("phoneNumber") String phoneNumber,
@Param("staffId") String staffId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java
......@@ -97,5 +97,13 @@ public interface StaffService {
*/
int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId);
/**
* 删除同手机号同wxUserId的其他用户
*
* @param staffId 导购id
* @param wxUserId wx用户id
* @param phoneNumber 手机号
* @param wxEnterpriseId 微信企业id
*/
void delOtherStaffById(String staffId, String wxUserId, String phoneNumber, String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java
......@@ -120,4 +120,10 @@ public class StaffServiceImpl implements StaffService {
return mapper.updateOpenUserIdsByUserId(wxEnterpriseId, wxUserId, wxOpenUseId);
}
@Override
public void delOtherStaffById(String staffId, String wxUserId, String phoneNumber, String wxEnterpriseId) {
mapper.delStaffByWxUserId(wxEnterpriseId, wxUserId, staffId);
mapper.delStaffByPhoneNumber(wxEnterpriseId, phoneNumber, staffId);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -390,6 +390,10 @@ public class StaffApiServiceImpl implements StaffApiService {
String nationCode = arr[0];
String phoneNumber = arr[1];
TabHaobanStaff staff = staffService.selectByPhoneNumberAndEnterpriseId(phoneNumber.trim(), wxEnterpriseId);
if (staff != null) {
//同手机号或者同wxUerId的导购只存在一个
staffService.delOtherStaffById(staff.getStaffId(), staff.getWxUserId(), staff.getPhoneNumber(), wxEnterpriseId);
}
staff = (staff == null ? new TabHaobanStaff() : staff);
staff.setWxUserId(userId);
staff.setUpdateTime(new Date());
......@@ -1519,7 +1523,7 @@ public class StaffApiServiceImpl implements StaffApiService {
return staffQrCodeDTO;
}
String qr_code = user.getQr_code();
staffMapper.updateQrCodeByStaffId(staffId,qr_code);
staffMapper.updateQrCodeByStaffId(staffId, qr_code);
staffQrCodeDTO.setQrCode(qr_code);
return staffQrCodeDTO;
}
......
haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
......@@ -459,4 +459,22 @@
and status_flag = 1 limit 1
</select>
<update id="delStaffByWxUserId">
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>
<update id="delStaffByPhoneNumber">
update tab_haoban_staff
set status_flag = 0,update_time = now()
where wx_enterprise_id = #{wxEnterpriseId}
and phone_number = #{phoneNumber}
and status_flag = 1
and staff_id != #{staffId}
</update>
</mapper>
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -102,13 +102,9 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_2);
}
List<StaffClerkRelationDTO> list = staffClerkRelationApiService.listByStoreId(storeId);
List<String> staffIds = list.stream().map(s -> s.getStaffId()).collect(Collectors.toList());
List<String> staffIds = list.stream().map(StaffClerkRelationDTO::getStaffId).collect(Collectors.toList());
List<StaffDTO> resultlist = staffApiService.listByIds(staffIds);
Map<String, StaffDTO> map = com.gic.commons.util.CollectionUtil.toMap(resultlist, "staffId");
int size = 0;
if (resultlist != null) {
size = resultlist.size();
}
List<StaffDTO> resultList = new ArrayList<>();
for (StaffClerkRelationDTO staffClerkRelationDTO : list) {
......@@ -122,7 +118,7 @@ public class ClerkController extends WebBaseController {
resultList.add(dto);
}
}
return resultResponse(HaoBanErrCode.ERR_1, resultlist);
return resultResponse(HaoBanErrCode.ERR_1, resultList);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment