This commit is contained in:
shuo.wang
2025-04-17 20:05:26 +08:00
parent 98ddba76fa
commit c973f11dc9

View File

@@ -181,7 +181,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
case SHOP_SUB_STAGE_STATUS_153:
nextStatus = SHOP_SUB_STAGE_STATUS_154;
List<EnterpriseUserDO> users = userAuthMappingService.getAllUserByRoleEnumAndRegionId(VICE_PRESIDENT_IN_CHARGE, shopInfoDAO.getShopInfo(request.getShopId()).getRegionId());
List<String> userIds = users.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());
List<String> userIds = new ArrayList<>();
if(CollectionUtils.isNotEmpty(users)){
userIds = users.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());
}
sendSms(request.getShopId(),userIds);
operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154,
curUserId,users,
@@ -191,7 +194,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
nextStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155;
if (StringUtils.isNotBlank(franchiseFeeDO.getDiscountReason())){
List<EnterpriseUserDO> users1 = userAuthMappingService.getAllUserByRoleEnumAndRegionId(PRESIDENT, shopInfoDAO.getShopInfo(request.getShopId()).getRegionId());
List<String> userIds1 = users1.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());
List<String> userIds1 = new ArrayList<>();
if(CollectionUtils.isNotEmpty(users1)){
userIds1 = users1.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());
}
sendSms(request.getShopId(),userIds1);
operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155,
curUserId, users1,