diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java index f791a1d8..f1697cec 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.dashboard.domain.vo.BillCountVo; +import com.ruoyi.ss.bonus.domain.Bonus; import com.ruoyi.ss.bonus.service.BonusConverter; import com.ruoyi.ss.device.domain.DeviceCountVO; import com.ruoyi.ss.device.domain.DeviceQuery; @@ -285,7 +286,8 @@ public class StoreAssemblerImpl implements StoreAssembler { this.assembleStaffList(list); for (StoreVo store : list) { - bonusConverter.toPoListByVip(store, store.getStaffList(), true); + List bonusList = bonusConverter.toPoListByVip(store, store.getStaffList(), true); + store.setBonusList(bonusList); } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserValidatorImpl.java index d76dcdb1..7d3d737d 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserValidatorImpl.java @@ -166,8 +166,11 @@ public class UserValidatorImpl extends BaseValidator implements UserValidator { storeAssembler.assembleBonusList(storeList); // 拼接商户VIP服务费 for (StoreVo store : storeList) { + if (CollectionUtils.isEmpty(store.getBonusList())) { + continue; + } BigDecimal totalPoint = CollectionUtils.sumDecimal(store.getBonusList(), Bonus::getPoint); - ServiceUtil.assertion(totalPoint.compareTo(BigDecimal.valueOf(100)) > 0, "校验商户VIP服务费失败,店铺【%s】的分成总和大于100%,当前值:%s%%", store.getName(), totalPoint); + ServiceUtil.assertion(totalPoint.compareTo(BigDecimal.valueOf(100)) > 0, "校验商户VIP服务费失败,店铺【%s】的分成总和大于100%%,当前值:%s%%", store.getName(), totalPoint); } } @@ -185,8 +188,11 @@ public class UserValidatorImpl extends BaseValidator implements UserValidator { deviceAssembler.assembleBonusList(deviceList); // 校验设备分成 for (DeviceVO device : deviceList) { + if (CollectionUtils.isEmpty(device.getBonusList())) { + continue; + } BigDecimal totalPoint = CollectionUtils.sumDecimal(device.getBonusList(), Bonus::getPoint); - ServiceUtil.assertion(totalPoint.compareTo(BigDecimal.valueOf(100)) > 0, "校验商户服务费失败,设备【%s】的分成总和大于100%,当前值:%s%%", device.getDeviceNo(), totalPoint); + ServiceUtil.assertion(totalPoint.compareTo(BigDecimal.valueOf(100)) > 0, "校验商户服务费失败,设备【%s】的分成总和大于100%%,当前值:%s%%", device.getDeviceNo(), totalPoint); } }