|
|
@@ -1,5 +1,6 @@
|
|
|
package com.cyksj.web.controller.distribute;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
@@ -124,7 +125,11 @@ public class EquipmentDistributeController {
|
|
|
if (config != null) {
|
|
|
String sysValue = config.getSysValue();
|
|
|
if (StrUtil.isNotBlank(sysValue)) {
|
|
|
- goodsIds = Jsons.parseObject(sysValue, EquipmentConfigDto.class).getSkuList().stream().map(GoodsDonSku::getGoodsId).collect(Collectors.toList());
|
|
|
+ EquipmentConfigDto equipmentConfigDto = Jsons.parseObject(sysValue, EquipmentConfigDto.class);
|
|
|
+ if (CollUtil.isEmpty(equipmentConfigDto.getSkuList())) {
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
|
+ }
|
|
|
+ goodsIds = equipmentConfigDto.getSkuList().stream().map(GoodsDonSku::getGoodsId).collect(Collectors.toList());
|
|
|
}
|
|
|
}
|
|
|
MapBuilder builder = MapUtils.builder()
|
|
|
@@ -154,6 +159,9 @@ public class EquipmentDistributeController {
|
|
|
throw BusinessRuntimeException.getInstance("");
|
|
|
}
|
|
|
EquipmentConfigDto equipmentConfigDto = Jsons.parseObject(sysValue, EquipmentConfigDto.class);
|
|
|
+ if (CollUtil.isEmpty(equipmentConfigDto.getSkuList())) {
|
|
|
+ throw BusinessRuntimeException.getInstance("暂无该车票权益");
|
|
|
+ }
|
|
|
Optional<GoodsDonSku> first = equipmentConfigDto.getSkuList().stream().filter(goodsDonSku -> {
|
|
|
if (goodsDonSku.getId().equals(skuId)) {
|
|
|
return true;
|