Skip to content

H
haoban-manage3.0
Commit e10a78ca by 徐高华
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !203
parents e56c646d e3253862
Showing with 80 additions and 72 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WxUserAddLogServiceImpl.java
...@@ -52,84 +52,92 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService { ...@@ -52,84 +52,92 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
@Override @Override
public void save(WxUserAddLogQDTO qdto) { public void save(WxUserAddLogQDTO qdto) {
log.info("保存用户信息-add={}", JSON.toJSON(qdto)); try {
String externalUserid = qdto.getExternalUserid(); log.info("保存用户信息-add={}", JSON.toJSON(qdto));
String wxUserId = qdto.getWxUserId(); String externalUserid = qdto.getExternalUserid();
TabWxUserAddLog entity = new TabWxUserAddLog(); String wxUserId = qdto.getWxUserId();
entity.setLogId(UniqueIdUtils.uniqueLong()); TabWxUserAddLog entity = new TabWxUserAddLog();
entity.setWxEnterpriseId(qdto.getWxEnterpriseId());
entity.setEnterpriseId(qdto.getEnterpriseId());
entity.setExternalUserid(externalUserid);
entity.setAddChannel(0);
entity.setStatusFlag(1);
entity.setWxUserId(qdto.getWxUserId());
entity.setStaffId(qdto.getStaffId());
entity.setStaffName(qdto.getStaffName());
entity.setAllDelFlag(0);
if (qdto.isDelFlag()) {
TabWxUserAddLog log = this.wxUserAddLogMapper.selectNewLog(externalUserid, wxUserId);
entity = log;
entity.setLogId(UniqueIdUtils.uniqueLong()); entity.setLogId(UniqueIdUtils.uniqueLong());
entity.setStatusFlag(2); entity.setWxEnterpriseId(qdto.getWxEnterpriseId());
// 是否所有好友删除 1是0否 entity.setEnterpriseId(qdto.getEnterpriseId());
entity.setAllDelFlag(this.isAllDel(externalUserid)); entity.setExternalUserid(externalUserid);
} entity.setAddChannel(0);
// 新增好友 entity.setStatusFlag(1);
if (!qdto.isDelFlag()) { entity.setWxUserId(qdto.getWxUserId());
String memberLabelId = null; entity.setStaffId(qdto.getStaffId());
if (null != qdto.getHmId()) { entity.setStaffName(qdto.getStaffName());
HmQrcodeBO hm = this.hmQrcodeService.queryById(qdto.getHmId()); entity.setAllDelFlag(0);
entity.setAddChannel(2); if (qdto.isDelFlag()) {
entity.setHmId(qdto.getHmId()); TabWxUserAddLog logUser = this.wxUserAddLogMapper.selectNewLog(externalUserid, wxUserId);
entity.setHmName(hm.getName()); if(null == logUser) {
Integer hmType = hm.getHmType(); log.info("删除好友") ;
if (hmType == 1) { return ;
entity.setClerkId(hm.getClerkId());
entity.setClerkCode(hm.getClerkCode());
entity.setClerkName(hm.getClerkName());
entity.setStoreId(hm.getStoreId());
entity.setStoreCode(hm.getStoreCode());
entity.setStoreName(hm.getStoreName());
} else if (hmType == 2) {
HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.queryByHmIdAndClerkId(qdto.getHmId(), qdto.getClerkId());
if (hmClerkRelationBO != null) {
entity.setClerkId(hmClerkRelationBO.getClerkId());
entity.setClerkCode(hmClerkRelationBO.getClerkCode());
entity.setClerkName(hmClerkRelationBO.getClerkName());
entity.setStoreId(hmClerkRelationBO.getStoreId());
entity.setStoreCode(hmClerkRelationBO.getStoreCode());
entity.setStoreName(hmClerkRelationBO.getStoreName());
}
} }
entity = logUser;
memberLabelId = hm.getMemberLabelId(); entity.setLogId(UniqueIdUtils.uniqueLong());
} entity.setStatusFlag(2);
if (null != qdto.getLinkId()) { // 是否所有好友删除 1是0否
HmLinkBO link = this.hmLinkService.getByLinkIdFormCache(qdto.getWxEnterpriseId(), entity.setAllDelFlag(this.isAllDel(externalUserid));
qdto.getEnterpriseId(), qdto.getLinkId());
entity.setAddChannel(1);
entity.setLinkId(qdto.getLinkId());
entity.setLinkName(link.getName());
memberLabelId = link.getMemberLabelId();
} }
// 新增好友
if (!qdto.isDelFlag()) {
String memberLabelId = null;
if (null != qdto.getHmId()) {
HmQrcodeBO hm = this.hmQrcodeService.queryById(qdto.getHmId());
entity.setAddChannel(2);
entity.setHmId(qdto.getHmId());
entity.setHmName(hm.getName());
Integer hmType = hm.getHmType();
if (hmType == 1) {
entity.setClerkId(hm.getClerkId());
entity.setClerkCode(hm.getClerkCode());
entity.setClerkName(hm.getClerkName());
entity.setStoreId(hm.getStoreId());
entity.setStoreCode(hm.getStoreCode());
entity.setStoreName(hm.getStoreName());
} else if (hmType == 2) {
HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.queryByHmIdAndClerkId(qdto.getHmId(), qdto.getClerkId());
if (hmClerkRelationBO != null) {
entity.setClerkId(hmClerkRelationBO.getClerkId());
entity.setClerkCode(hmClerkRelationBO.getClerkCode());
entity.setClerkName(hmClerkRelationBO.getClerkName());
entity.setStoreId(hmClerkRelationBO.getStoreId());
entity.setStoreCode(hmClerkRelationBO.getStoreCode());
entity.setStoreName(hmClerkRelationBO.getStoreName());
}
}
if (null != memberLabelId) { memberLabelId = hm.getMemberLabelId();
entity.setMemberLabelId(memberLabelId); }
MemberTagItemDTO dto = this.memberTagApiService.findMemberTagItem(memberLabelId); if (null != qdto.getLinkId()) {
if (null != dto) { HmLinkBO link = this.hmLinkService.getByLinkIdFormCache(qdto.getWxEnterpriseId(),
String tagId = dto.getTagId(); qdto.getEnterpriseId(), qdto.getLinkId());
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId); entity.setAddChannel(1);
entity.setMemberLabelName(tag.getTagName() + "-" + dto.getTagItemName()); entity.setLinkId(qdto.getLinkId());
} else { entity.setLinkName(link.getName());
log.info("会员标签查询null,memberLabelId={}", memberLabelId); memberLabelId = link.getMemberLabelId();
}
if (null != memberLabelId) {
entity.setMemberLabelId(memberLabelId);
MemberTagItemDTO dto = this.memberTagApiService.findMemberTagItem(memberLabelId);
if (null != dto) {
String tagId = dto.getTagId();
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
entity.setMemberLabelName(tag.getTagName() + "-" + dto.getTagItemName());
} else {
log.info("会员标签查询null,memberLabelId={}", memberLabelId);
}
}
if (null != qdto.getMemberId()) {
entity.setMemberId(qdto.getMemberId());
entity = this.addMemberInfo(qdto.getEnterpriseId(), qdto.getMemberId(), entity);
} }
} }
if (null != qdto.getMemberId()) { this.wxUserAddLogMapper.insert(entity);
entity.setMemberId(qdto.getMemberId()); }catch(Exception e) {
entity = this.addMemberInfo(qdto.getEnterpriseId(), qdto.getMemberId(), entity); e.printStackTrace();
}
} }
this.wxUserAddLogMapper.insert(entity);
} }
@Override @Override
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java
...@@ -424,7 +424,7 @@ public class TestController extends WebBaseController { ...@@ -424,7 +424,7 @@ public class TestController extends WebBaseController {
com.ctrip.framework.apollo.Config config = ConfigService.getConfig("COMMON.gic-properties"); com.ctrip.framework.apollo.Config config = ConfigService.getConfig("COMMON.gic-properties");
String env = config.getProperty("environment.value", ""); String env = config.getProperty("environment.value", "");
boolean isProd = "prod".equals(env); boolean isProd = "prod".equals(env);
return isProd ; return false ;
} }
} }
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