Skip to content

H
haoban-manage3.0
Commit 5542b7d4 by fudahua
Options

好友是否可以查看判断

parent 3eb5ad84
Showing with 79 additions and 48 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -17,6 +17,9 @@ import com.gic.commons.util.GICMQClientUtil; ...@@ -17,6 +17,9 @@ import com.gic.commons.util.GICMQClientUtil;
import com.gic.enterprise.api.dto.StoreDTO; import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.EnterpriseService; import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService; 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.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse; import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
...@@ -129,6 +132,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -129,6 +132,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
@Autowired @Autowired
private CheckQywxSettingApiService checkQywxSettingApiService; private CheckQywxSettingApiService checkQywxSettingApiService;
@Autowired
private CustomerApiService customerApiService;
@Override @Override
public void dealQywxExternalUser(String params) { public void dealQywxExternalUser(String params) {
log.info("回调：{}", params); log.info("回调：{}", params);
...@@ -159,6 +165,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -159,6 +165,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("staff关联门店不存在1"); log.info("staff关联门店不存在1");
return null; return null;
} }
// Map<String, StaffClerkRelationDTO> storeMap = clerkRelationDTOS.stream().collect(Collectors.toMap(mid -> mid.getStoreId(), dto -> dto, (o, n) -> n));
// //1、查该staff的门店id // //1、查该staff的门店id
// List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId); // List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId);
// if(CollectionUtil.isEmpty(relatedIds)){ // if(CollectionUtil.isEmpty(relatedIds)){
...@@ -186,57 +193,74 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -186,57 +193,74 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if (StringUtils.isEmpty(memberId)) { if (StringUtils.isEmpty(memberId)) {
continue; continue;
} }
String gicEnterpriseId = tab.getEnterpriseId(); // String gicEnterpriseId = tab.getEnterpriseId();
JSONObject searchJson = new JSONObject(); // JSONObject searchJson = new JSONObject();
searchJson = NewNodeAddUtil.addNewNodeForAnd(MemberDataEnum.member_memberId.getCode(), OperateEnum.OPERATE_EQ.getValue(), memberId, searchJson); // searchJson = NewNodeAddUtil.addNewNodeForAnd(MemberDataEnum.member_memberId.getCode(), OperateEnum.OPERATE_EQ.getValue(), memberId, searchJson);
DynamicSearchDTO dynamicSearchDTO = new DynamicSearchDTO(); // DynamicSearchDTO dynamicSearchDTO = new DynamicSearchDTO();
dynamicSearchDTO.setEnterpriseId(gicEnterpriseId); // dynamicSearchDTO.setEnterpriseId(gicEnterpriseId);
dynamicSearchDTO.setColumnCategoryCode("member"); // dynamicSearchDTO.setColumnCategoryCode("member");
dynamicSearchDTO.setSearchJson(searchJson); // dynamicSearchDTO.setSearchJson(searchJson);
dynamicSearchDTO.setBegin(0); // dynamicSearchDTO.setBegin(0);
dynamicSearchDTO.setRecordNumber(1); // dynamicSearchDTO.setRecordNumber(1);
log.info("gicEnterpriseId=========>{},searchJson=========={}", gicEnterpriseId, searchJson); // log.info("gicEnterpriseId=========>{},searchJson=========={}", gicEnterpriseId, searchJson);
ESResponseQueryBatch responseQuery = eSDataDynamicOperationApiService.queryDataBatch(dynamicSearchDTO, false, null); // ESResponseQueryBatch responseQuery = eSDataDynamicOperationApiService.queryDataBatch(dynamicSearchDTO, false, null);
if (null == responseQuery) { // if (null == responseQuery) {
log.info("会员不存在1"); // log.info("会员不存在1");
continue; // continue;
} // }
List<JSONObject> res = responseQuery.getRes(); // List<JSONObject> res = responseQuery.getRes();
if (CollectionUtil.isEmpty(res)) { // if (CollectionUtil.isEmpty(res)) {
log.info("会员不存在2"); // log.info("会员不存在2");
continue; // continue;
} // }
String storeId = ""; // String storeId = "";
for (JSONObject jsonObject : res) { // for (JSONObject jsonObject : res) {
storeId = jsonObject.get("storeId") == null ? "" : jsonObject.get("storeId").toString(); // storeId = jsonObject.get("storeId") == null ? "" : jsonObject.get("storeId").toString();
} // }
if (StringUtils.isEmpty(storeId)) { // if (StringUtils.isEmpty(storeId)) {
log.info("会员门店不存在"); // log.info("会员门店不存在");
continue; // continue;
} // }
String[] memberStoreIds = storeId.split(" "); // String[] memberStoreIds = storeId.split(" ");
List<String> memberStoreIdList = Arrays.asList(memberStoreIds); // List<String> memberStoreIdList = Arrays.asList(memberStoreIds);
if (CollectionUtil.isEmpty(memberStoreIdList)) { // if (CollectionUtil.isEmpty(memberStoreIdList)) {
log.info("会员门店不存在"); // log.info("会员门店不存在");
continue; // continue;
} // }
log.info("memberStoreIdList===============>{}", JSONObject.toJSONString(memberStoreIdList)); // log.info("memberStoreIdList===============>{}", JSONObject.toJSONString(memberStoreIdList));
log.info("storeIds===============>{}", JSONObject.toJSONString(storeIds)); // log.info("storeIds===============>{}", JSONObject.toJSONString(storeIds));
//取交集(解决不支持的报错现象) // //取交集(解决不支持的报错现象)
List list3 = new ArrayList(memberStoreIdList); // List list3 = new ArrayList(memberStoreIdList);
List list4 = new ArrayList(storeIds); // List list4 = new ArrayList(storeIds);
list3.retainAll(list4); // list3.retainAll(list4);
if (CollectionUtil.isEmpty(list3)) { // if (CollectionUtil.isEmpty(list3)) {
continue; // continue;
} else { // } else {
for (Object resultStoreId : list3) { // 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(); MemberStoreDTO dto = new MemberStoreDTO();
dto.setMemberId(memberId); dto.setMemberId(tab.getMemberId());
dto.setStoreId(resultStoreId.toString()); dto.setStoreId(tab.getStoreId());
result.add(dto); result.add(dto);
} }
}
} }
return result; return result;
} }
......
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
...@@ -76,6 +76,10 @@ ...@@ -76,6 +76,10 @@
<dubbo:reference id="innerApiService" interface="com.gic.haoban.app.customer.service.api.service.InnerApiService" 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 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"/> <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
...@@ -42,6 +42,9 @@ ...@@ -42,6 +42,9 @@
<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.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.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/>
......
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