BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1b412546eb9914d28fc394c8cc46f5c38d249a2e

Authored by YunaiV
1 parent b8889a94

fix：【Mall 商城】修复积分商品新增时校验商品是否参与其他活动校验失败

Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/point/PointActivityServiceImpl.java
  View file @1b41254
... ... @@ -222,6 +222,7 @@ public class PointActivityServiceImpl implements PointActivityService {
222 222 if (spu == null) {
223 223 throw exception(SPU_NOT_EXISTS);
224 224 }
  225 + products.forEach(product -> product.setSpuId(spuId));
225 226  
226 227 // 2. 校验商品 sku 都存在
227 228 List<ProductSkuRespDTO> skus = productSkuApi.getSkuListBySpuId(singletonList(spuId));
... ...
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/dto/kd100/Kd100ExpressQueryRespDTO.java
  View file @1b41254
... ... @@ -2,10 +2,11 @@ package cn.iocoder.yudao.module.trade.framework.delivery.core.client.dto.kd100;
2 2  
3 3 import com.fasterxml.jackson.annotation.JsonFormat;
4 4 import com.fasterxml.jackson.annotation.JsonProperty;
  5 +import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
  6 +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
5 7 import lombok.Data;
6 8  
7 9 import java.time.LocalDateTime;
8   -import java.time.format.DateTimeFormatter;
9 10 import java.util.List;
10 11  
11 12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
... ...