Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
506ece91
Commit
506ece91
authored
Aug 17, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:插入staffid
parent
50174698
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
AddMemberUnionRelateConsumerProcessor.java
...e/mq/processor/AddMemberUnionRelateConsumerProcessor.java
+2
-0
MemberUnionRelatedServiceImpl.java
...e/service/service/impl/MemberUnionRelatedServiceImpl.java
+0
-1
MemberUnionidRelatedApiServiceImpl.java
.../service/out/impl/MemberUnionidRelatedApiServiceImpl.java
+3
-5
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/mq/processor/AddMemberUnionRelateConsumerProcessor.java
View file @
506ece91
...
@@ -126,6 +126,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
...
@@ -126,6 +126,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
dto
.
setMemberId
(
memberId
);
dto
.
setMemberId
(
memberId
);
dto
.
setEnterpriseId
(
enterpriseId
);
dto
.
setEnterpriseId
(
enterpriseId
);
dto
.
setExternalUserid
(
externalUserid
);
dto
.
setExternalUserid
(
externalUserid
);
dto
.
setStaffId
(
staffId
);
// 创建memberUnion 临时表关联
// 创建memberUnion 临时表关联
memberUnionIdRelatedId
=
memberUnionRelatedService
.
addMemberUnionidRelated
(
dto
);
memberUnionIdRelatedId
=
memberUnionRelatedService
.
addMemberUnionidRelated
(
dto
);
}
else
{
}
else
{
...
@@ -136,6 +137,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
...
@@ -136,6 +137,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
exsitDTO
.
setEnterpriseId
(
enterpriseId
);
exsitDTO
.
setEnterpriseId
(
enterpriseId
);
exsitDTO
.
setExternalUserid
(
externalUserid
);
exsitDTO
.
setExternalUserid
(
externalUserid
);
exsitDTO
.
setSelfExternalUserid
(
selfExternalUserid
);
exsitDTO
.
setSelfExternalUserid
(
selfExternalUserid
);
exsitDTO
.
setStaffId
(
staffId
);
memberUnionRelatedService
.
update
(
exsitDTO
);
memberUnionRelatedService
.
update
(
exsitDTO
);
memberUnionIdRelatedId
=
exsitDTO
.
getMemberUnionidRelatedId
();
memberUnionIdRelatedId
=
exsitDTO
.
getMemberUnionidRelatedId
();
}
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java
View file @
506ece91
...
@@ -7,7 +7,6 @@ import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
...
@@ -7,7 +7,6 @@ import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
import
com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper
;
import
com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper
;
import
com.gic.haoban.manage.service.entity.MemberUnionidRelated
;
import
com.gic.haoban.manage.service.entity.MemberUnionidRelated
;
import
com.gic.haoban.manage.service.service.MemberUnionRelatedService
;
import
com.gic.haoban.manage.service.service.MemberUnionRelatedService
;
import
com.github.pagehelper.Page
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
View file @
506ece91
...
@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSON;
...
@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSON;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.JSONResponse
;
import
com.gic.api.base.commons.JSONResponse
;
import
com.gic.api.base.commons.Page
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.clerk.api.service.PowerService
;
import
com.gic.clerk.api.service.PowerService
;
...
@@ -26,10 +25,8 @@ import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
...
@@ -26,10 +25,8 @@ import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
import
com.gic.haoban.app.customer.enums.GicQywxSyncTypeEnum
;
import
com.gic.haoban.app.customer.enums.GicQywxSyncTypeEnum
;
import
com.gic.haoban.app.customer.enums.QywxSyncTaskTypeEnum
;
import
com.gic.haoban.app.customer.enums.QywxSyncTaskTypeEnum
;
import
com.gic.haoban.app.customer.service.api.service.CustomerApiService
;
import
com.gic.haoban.app.customer.service.api.service.CustomerApiService
;
import
com.gic.haoban.base.api.common.BasePageInfo
;
import
com.gic.haoban.base.api.common.ServiceResponse
;
import
com.gic.haoban.base.api.common.ServiceResponse
;
import
com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon
;
import
com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon
;
import
com.gic.haoban.common.utils.PageUtil
;
import
com.gic.haoban.manage.api.constants.Manage3Constants
;
import
com.gic.haoban.manage.api.constants.Manage3Constants
;
import
com.gic.haoban.manage.api.dto.*
;
import
com.gic.haoban.manage.api.dto.*
;
import
com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO
;
import
com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO
;
...
@@ -77,7 +74,6 @@ import com.gic.wechat.api.dto.qywx.welcome.*;
...
@@ -77,7 +74,6 @@ import com.gic.wechat.api.dto.qywx.welcome.*;
import
com.gic.wechat.api.enums.QywxMediaTypeEnum
;
import
com.gic.wechat.api.enums.QywxMediaTypeEnum
;
import
com.gic.wechat.api.service.qywx.QywxSuiteApiService
;
import
com.gic.wechat.api.service.qywx.QywxSuiteApiService
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
import
com.github.pagehelper.PageHelper
;
import
com.google.common.collect.Sets
;
import
com.google.common.collect.Sets
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -1467,6 +1463,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
...
@@ -1467,6 +1463,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
exsitDTO
.
setSelfExternalUserid
(
dto
.
getSelfExternalUserId
());
exsitDTO
.
setSelfExternalUserid
(
dto
.
getSelfExternalUserId
());
exsitDTO
.
setMemberId
(
memberId
);
exsitDTO
.
setMemberId
(
memberId
);
exsitDTO
.
setEnterpriseId
(
enterpriseId
);
exsitDTO
.
setEnterpriseId
(
enterpriseId
);
exsitDTO
.
setStaffId
(
staffId
);
memberUnionRelatedService
.
update
(
exsitDTO
);
memberUnionRelatedService
.
update
(
exsitDTO
);
}
}
String
relationKey
=
SecureUtil
.
md5
(
staffId
+
externalUserId
);
String
relationKey
=
SecureUtil
.
md5
(
staffId
+
externalUserId
);
...
@@ -1500,7 +1497,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
...
@@ -1500,7 +1497,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
external
.
setEnterpriseId
(
enterpriseId
);
external
.
setEnterpriseId
(
enterpriseId
);
external
.
setClerkId
(
clerkId
);
external
.
setClerkId
(
clerkId
);
external
.
setStaffId
(
staffId
);
external
.
setStaffId
(
staffId
);
external
.
setMemberId
(
memberId
);
external
.
setHeadUrl
(
dto
.
getAvatar
());
external
.
setHeadUrl
(
dto
.
getAvatar
());
external
.
setStatusFlag
(
1
);
external
.
setStatusFlag
(
1
);
externalClerkRelatedService
.
update
(
external
);
externalClerkRelatedService
.
update
(
external
);
...
@@ -1586,6 +1582,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
...
@@ -1586,6 +1582,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
exsitDTO
.
setAddCreateTime
(
createTime
);
exsitDTO
.
setAddCreateTime
(
createTime
);
exsitDTO
.
setSelfExternalUserid
(
dto
.
getSelfExternalUserId
());
exsitDTO
.
setSelfExternalUserid
(
dto
.
getSelfExternalUserId
());
exsitDTO
.
setExternalName
(
name
);
exsitDTO
.
setExternalName
(
name
);
exsitDTO
.
setEnterpriseId
(
enterpriseId
);
exsitDTO
.
setStaffId
(
staffId
);
memberUnionRelatedService
.
update
(
exsitDTO
);
memberUnionRelatedService
.
update
(
exsitDTO
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment