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
QianQiXiang
haoban-manage3.0
Commits
5542b7d4
Commit
5542b7d4
authored
Jun 27, 2021
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
好友是否可以查看判断
parent
3eb5ad84
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
83 additions
and
52 deletions
+83
-52
MemberUnionidRelatedApiServiceImpl.java
.../service/out/impl/MemberUnionidRelatedApiServiceImpl.java
+74
-50
dubbo-haoban-manage-service.xml
...ervice/src/main/resources/dubbo-haoban-manage-service.xml
+4
-0
dubbo-haoban-manage-wx.xml
...ge3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
+5
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
View file @
5542b7d4
...
...
@@ -17,6 +17,9 @@ import com.gic.commons.util.GICMQClientUtil;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.service.EnterpriseService
;
import
com.gic.enterprise.api.service.StoreService
;
import
com.gic.haoban.app.customer.dto.CustomerDTO
;
import
com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO
;
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.common.utils.PageUtil
;
...
...
@@ -129,6 +132,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
@Autowired
private
CheckQywxSettingApiService
checkQywxSettingApiService
;
@Autowired
private
CustomerApiService
customerApiService
;
@Override
public
void
dealQywxExternalUser
(
String
params
)
{
log
.
info
(
"回调:{}"
,
params
);
...
...
@@ -159,6 +165,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log
.
info
(
"staff关联门店不存在1"
);
return
null
;
}
// Map<String, StaffClerkRelationDTO> storeMap = clerkRelationDTOS.stream().collect(Collectors.toMap(mid -> mid.getStoreId(), dto -> dto, (o, n) -> n));
// //1、查该staff的门店id
// List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId);
// if(CollectionUtil.isEmpty(relatedIds)){
...
...
@@ -186,56 +193,73 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if
(
StringUtils
.
isEmpty
(
memberId
))
{
continue
;
}
String
gicEnterpriseId
=
tab
.
getEnterpriseId
();
JSONObject
searchJson
=
new
JSONObject
();
searchJson
=
NewNodeAddUtil
.
addNewNodeForAnd
(
MemberDataEnum
.
member_memberId
.
getCode
(),
OperateEnum
.
OPERATE_EQ
.
getValue
(),
memberId
,
searchJson
);
DynamicSearchDTO
dynamicSearchDTO
=
new
DynamicSearchDTO
();
dynamicSearchDTO
.
setEnterpriseId
(
gicEnterpriseId
);
dynamicSearchDTO
.
setColumnCategoryCode
(
"member"
);
dynamicSearchDTO
.
setSearchJson
(
searchJson
);
dynamicSearchDTO
.
setBegin
(
0
);
dynamicSearchDTO
.
setRecordNumber
(
1
);
log
.
info
(
"gicEnterpriseId=========>{},searchJson=========={}"
,
gicEnterpriseId
,
searchJson
);
ESResponseQueryBatch
responseQuery
=
eSDataDynamicOperationApiService
.
queryDataBatch
(
dynamicSearchDTO
,
false
,
null
);
if
(
null
==
responseQuery
)
{
log
.
info
(
"会员不存在1"
);
continue
;
}
List
<
JSONObject
>
res
=
responseQuery
.
getRes
();
if
(
CollectionUtil
.
isEmpty
(
res
))
{
log
.
info
(
"会员不存在2"
);
continue
;
}
String
storeId
=
""
;
for
(
JSONObject
jsonObject
:
res
)
{
storeId
=
jsonObject
.
get
(
"storeId"
)
==
null
?
""
:
jsonObject
.
get
(
"storeId"
).
toString
();
}
if
(
StringUtils
.
isEmpty
(
storeId
))
{
log
.
info
(
"会员门店不存在"
);
continue
;
}
String
[]
memberStoreIds
=
storeId
.
split
(
" "
);
List
<
String
>
memberStoreIdList
=
Arrays
.
asList
(
memberStoreIds
);
if
(
CollectionUtil
.
isEmpty
(
memberStoreIdList
))
{
log
.
info
(
"会员门店不存在"
);
continue
;
}
log
.
info
(
"memberStoreIdList===============>{}"
,
JSONObject
.
toJSONString
(
memberStoreIdList
));
log
.
info
(
"storeIds===============>{}"
,
JSONObject
.
toJSONString
(
storeIds
));
//取交集(解决不支持的报错现象)
List
list3
=
new
ArrayList
(
memberStoreIdList
);
List
list4
=
new
ArrayList
(
storeIds
);
list3
.
retainAll
(
list4
);
if
(
CollectionUtil
.
isEmpty
(
list3
))
{
continue
;
}
else
{
for
(
Object
resultStoreId
:
list3
)
{
MemberStoreDTO
dto
=
new
MemberStoreDTO
();
dto
.
setMemberId
(
memberId
);
dto
.
setStoreId
(
resultStoreId
.
toString
());
result
.
add
(
dto
);
}
// String gicEnterpriseId = tab.getEnterpriseId();
// JSONObject searchJson = new JSONObject();
// searchJson = NewNodeAddUtil.addNewNodeForAnd(MemberDataEnum.member_memberId.getCode(), OperateEnum.OPERATE_EQ.getValue(), memberId, searchJson);
// DynamicSearchDTO dynamicSearchDTO = new DynamicSearchDTO();
// dynamicSearchDTO.setEnterpriseId(gicEnterpriseId);
// dynamicSearchDTO.setColumnCategoryCode("member");
// dynamicSearchDTO.setSearchJson(searchJson);
// dynamicSearchDTO.setBegin(0);
// dynamicSearchDTO.setRecordNumber(1);
// log.info("gicEnterpriseId=========>{},searchJson=========={}", gicEnterpriseId, searchJson);
// ESResponseQueryBatch responseQuery = eSDataDynamicOperationApiService.queryDataBatch(dynamicSearchDTO, false, null);
// if (null == responseQuery) {
// log.info("会员不存在1");
// continue;
// }
// List<JSONObject> res = responseQuery.getRes();
// if (CollectionUtil.isEmpty(res)) {
// log.info("会员不存在2");
// continue;
// }
// String storeId = "";
// for (JSONObject jsonObject : res) {
// storeId = jsonObject.get("storeId") == null ? "" : jsonObject.get("storeId").toString();
// }
// if (StringUtils.isEmpty(storeId)) {
// log.info("会员门店不存在");
// continue;
// }
// String[] memberStoreIds = storeId.split(" ");
// List<String> memberStoreIdList = Arrays.asList(memberStoreIds);
// if (CollectionUtil.isEmpty(memberStoreIdList)) {
// log.info("会员门店不存在");
// continue;
// }
// log.info("memberStoreIdList===============>{}", JSONObject.toJSONString(memberStoreIdList));
// log.info("storeIds===============>{}", JSONObject.toJSONString(storeIds));
// //取交集(解决不支持的报错现象)
// List list3 = new ArrayList(memberStoreIdList);
// List list4 = new ArrayList(storeIds);
// list3.retainAll(list4);
// if (CollectionUtil.isEmpty(list3)) {
// continue;
// } else {
// for (Object resultStoreId : list3) {
// MemberStoreDTO dto = new MemberStoreDTO();
// dto.setMemberId(memberId);
// dto.setStoreId(resultStoreId.toString());
// result.add(dto);
// }
//
// }
CustomerDTO
params
=
new
CustomerDTO
();
params
.
setClerkType
(
"0"
);
params
.
setStoreId
(
tab
.
getStoreId
());
params
.
setClerkId
(
tab
.
getClerkId
());
params
.
setEnterpriseId
(
tab
.
getEnterpriseId
());
params
.
setStoreManagerFlag
(
false
);
MemberInfoListParamsDTO
memberInfoListParamsDTO
=
new
MemberInfoListParamsDTO
();
memberInfoListParamsDTO
.
setMemberId
(
tab
.
getMemberId
());
boolean
flag
=
customerApiService
.
checkMemberRangeByMemberId
(
params
,
memberInfoListParamsDTO
);
if
(
flag
)
{
MemberStoreDTO
dto
=
new
MemberStoreDTO
();
dto
.
setMemberId
(
tab
.
getMemberId
());
dto
.
setStoreId
(
tab
.
getStoreId
());
result
.
add
(
dto
);
}
}
return
result
;
...
...
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
View file @
5542b7d4
...
...
@@ -75,6 +75,10 @@
<dubbo:reference
id=
"qqCloudPicService"
interface=
"com.gic.thirdparty.api.service.QQCloudPicService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"innerApiService"
interface=
"com.gic.haoban.app.customer.service.api.service.InnerApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"customerApiService"
interface=
"com.gic.haoban.app.customer.service.api.service.CustomerApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"enterpriseService"
interface=
"com.gic.enterprise.api.service.EnterpriseService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
interface=
"com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi"
id=
"syncHaobanToGicServiceApi"
/>
...
...
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
View file @
5542b7d4
...
...
@@ -41,8 +41,11 @@
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService"
id=
"clerkMainStoreRelatedApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.app.customer.service.api.service.DistributeApiService"
id=
"distributeApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.app.customer.service.api.service.CustomerApiService"
id=
"customerApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.communicate.api.service.valid.ValidationCodeService"
id=
"validationCodeService"
/>
<dubbo:reference
interface=
"com.gic.thirdparty.api.service.QQCloudPicService"
id=
"qqCloudPicServiceImpl"
/>
...
...
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