Commit 31165474 by 徐高华

活码

parent 9a0f1222
......@@ -54,10 +54,8 @@ import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
import com.gic.haoban.manage.service.service.hm.HmPageService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeTempService;
import com.gic.member.api.dto.MemberClerkDTO;
import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.member.api.dto.es.MemberStoreClerkDataDTO;
import com.gic.member.api.service.MemberClerkApiService;
import com.gic.member.api.service.MemberService;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
......@@ -94,8 +92,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
@Autowired
private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
@Autowired
private MemberClerkApiService memberClerkApiService;
@Autowired
private HmPageService hmPageService;
@Autowired
private StoreService storeService;
......@@ -430,27 +426,10 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
return storeList ;
}
// 先不排序,可以随机
private List<MemberStoreClerkDataDTO> sortMemberClerk(String enterpriseId, String memberId,
List<MemberStoreClerkDataDTO> list) {
ServiceResponse<List<MemberClerkDTO>> resp = this.memberClerkApiService.getMemberMainClerkList(enterpriseId,
memberId);
if (!resp.isSuccess() && CollectionUtils.isEmpty(resp.getResult())) {
log.info("member主导购={},memberId", resp.getMessage(), memberId);
return list;
}
List<MemberStoreClerkDataDTO> retList = new ArrayList<>();
List<String> mainClerkIdList = resp.getResult().stream().map(dto -> dto.getClerkId())
.collect(Collectors.toList());
List<MemberStoreClerkDataDTO> notMainClerkList = new ArrayList<>();
for (MemberStoreClerkDataDTO item : list) {
if (mainClerkIdList.contains(item.getClerkIdRel())) {
retList.add(item);
} else {
notMainClerkList.add(item);
}
}
retList.addAll(notMainClerkList);
return retList;
return list;
}
// 创建活码
......
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