Skip to content

H
haoban-manage3.0
Commit 09b75f19 by huangZW
Options

Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

parents a84244c6 28a5e3d5
Showing with 41 additions and 23 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/PreDealLogInfoDTO.java
......@@ -59,6 +59,8 @@ public class PreDealLogInfoDTO implements Serializable {
*/
private Integer statusFlag;
private String reason;
/**
*
*/
......@@ -73,6 +75,14 @@ public class PreDealLogInfoDTO implements Serializable {
*/
private static final long serialVersionUID = 1L;
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public String getDataCode() {
return dataCode;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanPreDealLog.java
......@@ -61,6 +61,16 @@ public class TabHaobanPreDealLog implements Serializable {
private String dataContent;
private String reason;
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public String getDataContent() {
return dataContent;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
......@@ -444,7 +444,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
for (SyncTaskDTO dto : result) {
String addUser = dto.getAddUser();
TabHaobanStaff haobanStaff = staffService.selectById(addUser);
if (null == haobanStaff) {
if (null != haobanStaff) {
dto.setUserName(haobanStaff.getStaffName());
} else {
dto.setUserName("系统管理员");
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -433,12 +433,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
}
String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getSuiteId(), userId1);
JSONObject wxJson = JSON.parseObject(wxRes);
String externalUserId = "";
MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
if("0".equals(wxJson.getString("errcode"))){
String external_userid = wxJson.getString("external_userid");
JSONArray jsonArr = wxJson.getJSONArray(external_userid);
String externalUserId = "";
log.info("【新增外部联系人】wxRes={}",wxRes);
if(StringUtils.isNotBlank(wxRes)){
JSONArray jsonArr = JSON.parseArray(wxRes);
String wxName = "";
for (Object externalUserid : jsonArr) {
String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getSuiteId(), externalUserid.toString());
......@@ -459,8 +458,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String followJson = JSON.toJSONString(object);
JSONObject follow = JSON.parseObject(followJson);
uj_userId = follow.getString("userid");
log.info("【新增外部联系人】createTime={},name={},followCreateTime={},wxName={}",createTime,name,follow.getString("createtime"),wxName);
if(uj_userId.equals(userId1) && createTime.equals(follow.getString("createtime")) && name.equals(wxName)){
dto.setExternalUserid(externalUserId);
break;
}
}
}
......@@ -514,7 +515,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if(member != null){
dto.setMemberId(member.getMemberId());
}
dto.setExternalUserid(externalUserId);
dto.setUnionid(unionId);
dto.setExternalName(name);
......@@ -532,7 +532,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
dto.setMemberId(dto.getMemberId());
//更新对外联系人id
dto.setSelfExternalUserid(selfExternalUserId);
memberUnionRelatedService.update(exsitDTO);
uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
}else{
return "";
......@@ -570,25 +569,23 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
}
@Override
public void freshWxFrend(String wxEnterpriseId, String wxUserId) {
log.info("【刷下好友】wxUserId={}",wxUserId);
WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
String res = qywxUserApiService.listSelfExternalUserid(enterprise.getCorpid(), enterprise.getWxSecretKey(), wxUserId);
log.info("【刷下好友】res={}",res);
if(StringUtils.isBlank(res)){
return;
}
JSONObject json = JSON.parseObject(res);
if("0".equals(json.getString("errcode"))){
String external_userid = json.getString("external_userid");
JSONArray jsonArr = json.getJSONArray(external_userid);
List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
List<String> externalUserIdList = list.stream().map(student->student.getExternalUserid())
.collect(Collectors.toList());
for (Object object : jsonArr) {
if(externalUserIdList.contains(object.toString())){
continue;
}else{
//String string = qywxUserApiService.getCorpSelfExternalUseridInfo(enterprise.getCorpid(), enterprise.getWxSecretKey(), object.toString());
this.add(wxEnterpriseId, object.toString(), wxUserId);
}
JSONArray jsonArr = JSON.parseArray(res);
List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
List<String> externalUserIdList = list.stream().map(student->student.getExternalUserid())
.collect(Collectors.toList());
for (Object object : jsonArr) {
if(externalUserIdList.contains(object.toString())){
continue;
}else{
//String string = qywxUserApiService.getCorpSelfExternalUseridInfo(enterprise.getCorpid(), enterprise.getWxSecretKey(), object.toString());
this.add(wxEnterpriseId, object.toString(), wxUserId);
}
}
......
haoban-manage3-service/src/main/resources/mapper/PreDealLogMapper.xml
......@@ -7,6 +7,7 @@
<result column="enterprise_id" jdbcType="VARCHAR" property="enterpriseId"/>
<result column="data_id" jdbcType="VARCHAR" property="dataId"/>
<result column="data_content" jdbcType="VARCHAR" property="dataContent"/>
<result column="reason" jdbcType="VARCHAR" property="reason"/>
<result column="p_data_id" jdbcType="VARCHAR" property="pDataId"/>
<result column="task_id" jdbcType="VARCHAR" property="taskId"/>
<result column="data_type" jdbcType="INTEGER" property="dataType"/>
......@@ -15,7 +16,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Base_Column_List">
id, wx_enterprise_id,enterprise_id, data_id, p_data_id, task_id, data_type, status_flag, create_time,
id, wx_enterprise_id,enterprise_id, data_id, p_data_id, task_id, data_type, status_flag,reason, create_time,
update_time
</sql>
<sql id="Base_Column_List_data">
......
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