suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-04-15 13:38:09 +08:00
parent da53fb148c
commit c835844913
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java
View File

@@ -58,7 +58,7 @@ public interface PushService {
*/
String getPosToken(GetAccessTokenDTO dto);
List<XgjOrganizationDTO> getXgjOrganization(String partnerId);
List<XgjOrganizationDTO> getXgjOrganization(String parentId);

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class PushServiceImpl implements PushService {
}
@Override
public List<XgjOrganizationDTO> getXgjOrganization(String partnerId) {
public List<XgjOrganizationDTO> getXgjOrganization(String parentId) {
String key = active+"_XgjOrganization_" + eid;
String resObject = redisUtilPool.getString(key);
if (StringUtils.isBlank(resObject)) {
@@ -171,7 +171,7 @@ public class PushServiceImpl implements PushService {
}
List<XgjOrganizationDTO> filteredList = response.stream()
.filter(customer -> customer.getParentId().equals(partnerId))
.filter(customer -> customer.getParentId().equals(parentId))
.collect(Collectors.toList());
return filteredList;

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -93,7 +93,9 @@ public class SyncDataServiceImpl implements SyncDataService {
if (signFranchiseDO != null) {
List<String> partnershipSignatory = new ArrayList<>();
partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst());
partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond());
if (StringUtils.isNotBlank(signFranchiseDO.getPartnershipSignatorySecond())) {
partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond());
}
request.setPartnershipSignatory(partnershipSignatory);
request.setBusinessModel(signFranchiseDO.getBusinessModel());
}