Skip to content

H
haoban-manage3.0
Commit 3a7d0474 by 墨竹
Options

fix：bug修改

parent 90886fba
Showing with 24 additions and 22 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
......@@ -130,7 +130,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmQrcodeQDTO.setHmGroupId(0L);
}
List<String> clerkIdList = setStoreClerk(hmQrcodeQDTO, wxEnterpriseId, hmId, hmType,true);
List<String> clerkIdList = setStoreClerk(hmQrcodeQDTO, wxEnterpriseId, hmId, hmType, true);
if (CollectionUtils.isEmpty(clerkIdList)) {
return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "该导购已经生成过活码或未关联过好办");
}
......@@ -236,7 +236,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "该活码不存在");
}
Integer hmType = hmQrcodeQDTO.getHmType();
List<String> clerkIdList = setStoreClerk(hmQrcodeQDTO, wxEnterpriseId, hmId, hmType,false);
List<String> clerkIdList = setStoreClerk(hmQrcodeQDTO, wxEnterpriseId, hmId, hmType, false);
if (CollectionUtils.isEmpty(clerkIdList)) {
return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "该导购已经生成过活码或未关联过好办");
}
......@@ -313,16 +313,16 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
String memberLabelId = hmQrcodeQDTO.getMemberLabelId();
String memberLabelIdOld = hmOld.getMemberLabelId();
if (!memberLabelId.equals(memberLabelIdOld)) {
MemberTagItemDTO tagItem = memberTagApiService.findMemberTagItem(memberLabelId);
MemberTagItemDTO tagItem = memberTagApiService.findMemberTagItem(memberLabelId);
MemberTagItemDTO tagItemOld = memberTagApiService.findMemberTagItem(memberLabelIdOld);
String oldTagName = "";
String tagName = "";
if (tagItemOld != null) {
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagItemOld.getTagId()) ;
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagItemOld.getTagId());
oldTagName = tag.getTagName() + "-" + tagItem.getTagItemName();
}
if (tagItem != null) {
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagItem.getTagId()) ;
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagItem.getTagId());
tagName = tag.getTagName() + "-" + tagItem.getTagItemName();
}
logContent.append("活码标签「").append(oldTagName).append("」").append("变更为「").append(tagName).append("」");
......@@ -376,17 +376,24 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
* @param hmType
* @return
*/
private List<String> setStoreClerk(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId, Integer hmType,Boolean addFlag) {
private List<String> setStoreClerk(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId, Integer hmType, Boolean addFlag) {
List<String> clerkIdList = hmQrcodeQDTO.getClerkIdList();
if (CollectionUtils.isEmpty(clerkIdList)) {
return null;
}
//单人活码
String clerkId = clerkIdList.get(0);
if (hmType == 2) {
//多人活码
insertHmClerkRelation(hmQrcodeQDTO, wxEnterpriseId, hmId, clerkIdList,addFlag);
insertHmClerkRelation(hmQrcodeQDTO, wxEnterpriseId, hmId, clerkIdList, addFlag);
} else if (hmType == 1) {
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
if (addFlag && hmQrcodeBO != null) {
logger.error("已经生成过活码,clerkId：{}", clerkId);
return null;
}
}
//单人活码
String clerkId = clerkIdList.get(0);
hmQrcodeQDTO.setClerkId(clerkId);
ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
if (clerkDTO != null) {
......@@ -400,11 +407,6 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmQrcodeQDTO.setStoreName(storeDTO.getStoreName());
}
}
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
if (addFlag && hmQrcodeBO != null) {
logger.error("已经生成过活码,clerkId：{}", clerkId);
return null;
}
StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
if (staffClerkRelationDTO != null) {
hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
......@@ -425,7 +427,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
* @param hmId
* @param clerkIdList
*/
private void insertHmClerkRelation(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId, List<String> clerkIdList,Boolean addFlag) {
private void insertHmClerkRelation(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId, List<String> clerkIdList, Boolean addFlag) {
Date now = new Date();
for (String clerkId : clerkIdList) {
HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.queryByHmIdAndClerkId(hmId, clerkId);
......@@ -483,8 +485,8 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
}
MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(hmQrcodeBO.getMemberLabelId());
if (null != tagItem) {
String tagId = tagItem.getTagId() ;
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId) ;
String tagId = tagItem.getTagId();
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
hmQrcodeBO.setMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
hmQrcodeBO.setMemberLabelStatus(tagItem.getStatus());
}
......@@ -546,7 +548,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
}
@Override
public ServiceResponse delByClerkId(String clerkId, String enterpriseId,String wxEnterpriseId) {
public ServiceResponse delByClerkId(String clerkId, String enterpriseId, String wxEnterpriseId) {
// 单人活码 直接废弃，多人活码，更新
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
if (hmQrcodeBO != null) {
......@@ -716,7 +718,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
RedisUtil.setCache(key, hmQrcodeStoreDTOS, 10L, TimeUnit.MINUTES);
return hmQrcodeStoreDTOS;
}
@Override
public List<String> getHmStoreForWxa(String enterpriseId) {
String key = "HM:STORE:WXA" + enterpriseId;
......@@ -724,7 +726,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
if (cache != null) {
return (List<String>) cache;
}
List<String> list = hmQrcodeService.getHmStoreForWxa(enterpriseId);
List<String> list = hmQrcodeService.getHmStoreForWxa(enterpriseId);
RedisUtil.setCache(key, list, 10L, TimeUnit.MINUTES);
return list;
}
......@@ -732,7 +734,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
@Override
public Page<HmClerkRelationDTO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId) {
Page<HmClerkRelationBO> hmClerkByHmId = hmClerkRelationService.getHmClerkByHmId(basePageInfo, hmId);
return PageUtil.changeToCurrentPage(hmClerkByHmId,HmClerkRelationDTO.class);
return PageUtil.changeToCurrentPage(hmClerkByHmId, HmClerkRelationDTO.class);
}
/**
......@@ -766,7 +768,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
public HmClerkRelationDTO getOneHmClerkByHmIdAndStaffId(Long hmId, String staffId) {
return EntityUtil.changeEntityNew(HmClerkRelationDTO.class, hmClerkRelationService.getHmClerkByHmIdAndStaffId(hmId, staffId));
}
@Override
public ServiceResponse<List<String>> listHmIdForIndex(HmQrcodeListQDTO qdto) {
return ServiceResponse.success(hmQrcodeService.listHmIdForIndex(qdto));
......
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