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

feat:bug

Browse Source
This commit is contained in:
苏竹红
2025-04-21 18:34:56 +08:00
parent 87b015f782
commit 4cf1cb8d78
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -514,7 +514,7 @@ public class DeskServiceImpl implements DeskService {
if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus());
}
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true);
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true);
}

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -120,7 +120,7 @@ public class PointServiceImpl implements PointService {
request1.setOpType(OpTypeEnum.INSERT.getCode());
request1.setCode(shopPointDetailRequest.getOpportunityPointCode());
request1.setUserId(userId);
request1.setMobile(user.getMobile());
request1.setMobile(StringUtils.isNotBlank(user.getMobile())?user.getMobile():"");
if (StringUtils.isBlank(user.getName())) {
if (StringUtils.isNotBlank(user.getMobile()) && user.getMobile().length() >= 4) {
// 获取后4位
@@ -194,7 +194,7 @@ public class PointServiceImpl implements PointService {
request1.setUserName(user.getName());
} else {
request1.setUserId(lineInfoDO.getPartnerId());
request1.setMobile(lineInfoDO.getMobile());
request1.setMobile(StringUtils.isNotBlank(lineInfoDO.getMobile())?lineInfoDO.getMobile():"");
request1.setUserName(lineInfoDO.getUsername());
}
request1.setOpType(OpTypeEnum.UPDATE.getCode());
@@ -972,7 +972,7 @@ public class PointServiceImpl implements PointService {
request1.setOpType(OpTypeEnum.INSERT.getCode());
request1.setCode(request.getOpportunityPointCode());
request1.setUserId(lineInfo.getPartnerId());
request1.setMobile(lineInfo.getMobile());
request1.setMobile(StringUtils.isNotBlank(lineInfo.getMobile())?lineInfo.getMobile():"");
if (StringUtils.isBlank(lineInfo.getUsername())) {
if (StringUtils.isNotBlank(lineInfo.getMobile()) && lineInfo.getMobile().length() >= 4) {
// 获取后4位