Skip to content

H
haoban-manage3.0
Commit d81038eb by qwmqiuwenmin
Options

fix

parent 058f895a
Showing with 91 additions and 20 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
...@@ -26,4 +26,6 @@ public interface TabHaobanExternalClerkRelatedMapper { ...@@ -26,4 +26,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
void delByClerkIdAndStaffId(@Param("clerkId")String clerkId, @Param("staffId")String staffId); void delByClerkIdAndStaffId(@Param("clerkId")String clerkId, @Param("staffId")String staffId);
void cleanStaffRelated(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffIds")List<String> staffIds); void cleanStaffRelated(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("staffIds")List<String> staffIds);
TabHaobanExternalClerkRelated getByParams(@Param("userId")String userId, @Param("wxEnterpriseId")String wxEnterpriseId, @Param("name")String name, @Param("createTime")String createTime);
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/ExternalClerkRelatedService.java
...@@ -15,4 +15,8 @@ public interface ExternalClerkRelatedService { ...@@ -15,4 +15,8 @@ public interface ExternalClerkRelatedService {
void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds); void cleanStaffRelated(String wxEnterpriseId, List<String> staffIds);
void update(TabHaobanExternalClerkRelated exsitDTO);
TabHaobanExternalClerkRelated getByParams(String userId, String wxEnterpriseId, String name, String createTime);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
...@@ -54,4 +54,17 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -54,4 +54,17 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
} }
@Override
public void update(TabHaobanExternalClerkRelated exsitDTO) {
exsitDTO.setUpdateTime(new Date());
mapper.updateByPrimaryKeySelective(exsitDTO);
}
@Override
public TabHaobanExternalClerkRelated getByParams(String userId, String wxEnterpriseId, String name,
String createTime) {
return mapper.getByParams(userId, wxEnterpriseId,name,createTime);
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -312,21 +312,46 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -312,21 +312,46 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
uuid = exsitDTO.getMemberUnionidRelatedId(); uuid = exsitDTO.getMemberUnionidRelatedId();
} }
String staffId = staff.getStaffId();
//新增导购和外部联系人关系 //新增导购和外部联系人关系
if(SELF_APP.equals(suiteid)){ if(SELF_APP.equals(suiteid)){
String staffId = staff.getStaffId();
TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId); TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId);
if(r == null){ if(r == null){
log.info("【新增外部联系人】主门店为空"); log.info("【新增外部联系人】主门店为空");
return ""; return "";
} }
insertExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),r.getStoreId()); insertExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),r.getStoreId());
}else{
insertExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid());
} }
return uuid; return uuid;
} }
private void insertExternalClerkRelated(ExternalUserPojo pojo,String wxEnterpriseId,String staffId,String memberUnionidRelatedId,String userId,String externalUserId,String storeId){ private void insertExternalClerkRelated(ExternalUserPojo pojo, String wxEnterpriseId, String staffId, String memberUnionidRelatedId,
String userId, String externalUserid) {
String unionId = pojo.getUnionId();
String name = pojo.getName();
String createTime = pojo.getAddCreateTime();
String relaName = name;
TabHaobanExternalClerkRelated exsitDTO = externalClerkRelatedService.getByParams(userId, wxEnterpriseId,name,createTime);
if(exsitDTO == null){
TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
related.setAddCreateTime(createTime);
related.setExternalName(relaName);
related.setStaffId(staffId);
related.setMemberUnionidRelatedId(memberUnionidRelatedId);
related.setUnionid(unionId);
related.setWxEnterpriseId(wxEnterpriseId);
related.setWxUserId(userId);
externalClerkRelatedService.insert(related);
}else{
exsitDTO.setExternalUserId(externalUserid);
externalClerkRelatedService.update(exsitDTO);
}
}
private void insertExternalClerkRelatedSelf(ExternalUserPojo pojo,String wxEnterpriseId,String staffId,String memberUnionidRelatedId,String userId,String externalUserId,String storeId){
MemberDTO member = null; MemberDTO member = null;
StoreDTO mainStore = null; StoreDTO mainStore = null;
mainStore = storeService.getStore(storeId); mainStore = storeService.getStore(storeId);
...@@ -355,22 +380,35 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -355,22 +380,35 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
member = memberOpenCardBusinessService.getMemberByQywxChannelParam(mainStore.getEnterpriseId(),unionId,"",relaName,avatar,clerk.getQrcodeParam()); member = memberOpenCardBusinessService.getMemberByQywxChannelParam(mainStore.getEnterpriseId(),unionId,"",relaName,avatar,clerk.getQrcodeParam());
} }
log.info("【新增外部联系人】member={},clerk={}",JSON.toJSONString(member),JSON.toJSONString(clerk)); log.info("【新增外部联系人】member={},clerk={}",JSON.toJSONString(member),JSON.toJSONString(clerk));
TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated(); TabHaobanExternalClerkRelated exsitDTO = externalClerkRelatedService.getByParams(userId, wxEnterpriseId,name,createTime);
related.setAddCreateTime(createTime); if(exsitDTO == null){
related.setClerkId(staffClerkRelationDTO.getClerkId()); TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
related.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId()); related.setAddCreateTime(createTime);
related.setExternalName(relaName); related.setClerkId(staffClerkRelationDTO.getClerkId());
related.setExternalUserId(externalUserId); related.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
related.setStaffId(staffId); related.setExternalName(relaName);
related.setMemberUnionidRelatedId(memberUnionidRelatedId); related.setExternalUserId(externalUserId);
related.setStoreId(storeId); related.setStaffId(staffId);
related.setUnionid(unionId); related.setMemberUnionidRelatedId(memberUnionidRelatedId);
related.setWxEnterpriseId(wxEnterpriseId); related.setStoreId(storeId);
related.setWxUserId(userId); related.setUnionid(unionId);
if(member != null){ related.setWxEnterpriseId(wxEnterpriseId);
related.setMemberId(member.getMemberId()); related.setWxUserId(userId);
} if(member != null){
externalClerkRelatedService.insert(related); related.setMemberId(member.getMemberId());
}
externalClerkRelatedService.insert(related);
}else{
if(member != null){
exsitDTO.setMemberId(member.getMemberId());
}
exsitDTO.setUnionid(unionId);
exsitDTO.setStoreId(storeId);
exsitDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
exsitDTO.setClerkId(staffClerkRelationDTO.getClerkId());
externalClerkRelatedService.update(exsitDTO);
}
} }
private ExternalUserPojo getExternalUserPojo(String unionIdJson,String userId1,String wxEnterpriseId) { private ExternalUserPojo getExternalUserPojo(String unionIdJson,String userId1,String wxEnterpriseId) {
...@@ -465,7 +503,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -465,7 +503,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
//新增门店和导购的关联关系 //新增门店和导购的关联关系
String staffId = staff.getStaffId(); String staffId = staff.getStaffId();
insertExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),storeId); insertExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, dto.getExternalUserid(),storeId);
return uuid; return uuid;
} }
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
...@@ -261,4 +261,16 @@ ...@@ -261,4 +261,16 @@
</foreach> </foreach>
and status_flag = 1 and status_flag = 1
</update> </update>
<select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_external_clerk_related
where clerk_id = #{clerkId,jdbcType=VARCHAR}
and wx_user_id = #{wxUserId}
and wx_enterprise_id = #{wxEnterpriseId}
and external_name = #{name}
and add_create_time = #{createTime}
and status_flag = 1
</select>
</mapper> </mapper>
\ No newline at end of file
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