Commit dadbac6a by 王祖波

Merge remote-tracking branch 'origin/developer' into developer

parents ee7ec136 1415f67d
......@@ -34,7 +34,20 @@ public class HmLinkWxaDTO implements Serializable {
private List<HmLinkStoreDTO> storeList;
// 说明
private Map<String,String> remarkMap ;
/**
* 是否企微好友
*/
private Integer qwFriendFlag ;
public Integer getQwFriendFlag() {
return qwFriendFlag;
}
public void setQwFriendFlag(Integer qwFriendFlag) {
this.qwFriendFlag = qwFriendFlag;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
......
......@@ -162,7 +162,7 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
if(CollectionUtils.isEmpty(list)) {
this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), clerkIdList,"任务下发时未绑定企微号");
}else {
List<String> noStaffClerkIdList = allList.stream().filter(o->map.keySet().contains(o.getClerkId())).map(o->o.getClerkId()).collect(Collectors.toList());
List<String> noStaffClerkIdList = allList.stream().filter(o->!map.keySet().contains(o.getClerkId())).map(o->o.getClerkId()).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(noStaffClerkIdList)) {
this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), noStaffClerkIdList,"任务下发时未绑定企微号");
}
......@@ -170,6 +170,9 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
for(QwMomentPlanAttendDTO dto : allList) {
String cid = dto.getClerkId() ;
String sid = dto.getStaffId() ;
if(noStaffClerkIdList.contains(cid)) {
continue;
}
if(map.get(cid) != null && map.get(cid).equals(sid)) {
}else {
this.qwMomentPlanAttendMapper.updateSuccessStaff(plan.getPlanId(),cid,map.get(cid));
......
......@@ -709,7 +709,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
List<String> friendList = this.tabHaobanExternalClerkRelatedMapper.listMemberAndClerk(Arrays.asList(memberId), clerkIdList, enterpriseId) ;
if(CollectionUtils.isNotEmpty(friendList)) {
log.info("已存在好友");
return ServiceResponse.failure("1000", "已存在好友") ;
// return ServiceResponse.failure("1000", "已存在好友") ;
}
String mainClerkId = member.getMainClerkId();
String mainStoreId = member.getMainStoreId();
......@@ -762,6 +762,11 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
retDTO.setHmQrcode(addResp.getResult());
}
}
String staffId = hm.getStaffId() ;
TabHaobanExternalClerkRelated related = tabHaobanExternalClerkRelatedMapper.getByMemberId(staffId, memberId) ;
if(null != related) {
retDTO.setQwFriendFlag(1);
}
}
// 生成动态活码
log.info("活码数据返回={}", JSON.toJSONString(retDTO));
......
......@@ -1577,7 +1577,12 @@ public class WxStaffController extends WebBaseController {
List<String> list = staffApiService.getNotEmptyHaobanStoreIdsRolesByClerkIdAndStoreStatus(clerkId, wxEnterpriseId,
StoreStatusFilterUtils.getStoreStatusList(storeStatusFilter), null);
storeRoleVO.setStoreCount(list.contains("no_store") ? 0 : list.size());
storeRoleVO.setStoreDTO(list.contains("no_store") ? null : storeService.getStore(list.get(0)));
StoreDTO dto = list.contains("no_store") ? null : storeService.getStore(list.get(0)) ;
if(null != dto) {
EnterpriseDTO en = this.enterpriseService.getEnterpriseById(dto.getEnterpriseId()) ;
dto.setBrandName(en.getBrandName());
}
storeRoleVO.setStoreDTO(dto);
return RestResponse.successResult(storeRoleVO);
}
......
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