BJ_ZTEITS-Developers / parking-cloud-yudao

Commit e2a8f7b38973b21ff8f5293fb90cf23391839dd2

Authored by puhui999
1 parent 651725e3

fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑

Inline Side-by-side
Showing 2 changed files with 20 additions and 22 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
  View file @e2a8f7b
@@ -68,20 +68,19 @@ public interface CombinationActivityConvert { @@ -68,20 +68,19 @@ public interface CombinationActivityConvert {
68 68
69 List<CombinationProductRespVO> convertList2(List<CombinationProductDO> productDOs); 69 List<CombinationProductRespVO> convertList2(List<CombinationProductDO> productDOs);
70 70
71 - // TODO @puhui999：参数改成 activity、product 会不会干净一点哈  
72 @Mappings({ 71 @Mappings({
73 @Mapping(target = "id", ignore = true), 72 @Mapping(target = "id", ignore = true),
74 - @Mapping(target = "activityId", source = "activityDO.id"),  
75 - @Mapping(target = "spuId", source = "activityDO.spuId"),  
76 - @Mapping(target = "skuId", source = "vo.skuId"),  
77 - @Mapping(target = "activePrice", source = "vo.activePrice"),  
78 - @Mapping(target = "activityStartTime", source = "activityDO.startTime"),  
79 - @Mapping(target = "activityEndTime", source = "activityDO.endTime") 73 + @Mapping(target = "activityId", source = "activity.id"),
  74 + @Mapping(target = "spuId", source = "activity.spuId"),
  75 + @Mapping(target = "skuId", source = "product.skuId"),
  76 + @Mapping(target = "activePrice", source = "product.activePrice"),
  77 + @Mapping(target = "activityStartTime", source = "activity.startTime"),
  78 + @Mapping(target = "activityEndTime", source = "activity.endTime")
80 }) 79 })
81 - CombinationProductDO convert(CombinationActivityDO activityDO, CombinationProductBaseVO vo); 80 + CombinationProductDO convert(CombinationActivityDO activity, CombinationProductBaseVO product);
82 81
83 - default List<CombinationProductDO> convertList(List<? extends CombinationProductBaseVO> products, CombinationActivityDO activityDO) {  
84 - return CollectionUtils.convertList(products, item -> convert(activityDO, item).setActivityStatus(activityDO.getStatus())); 82 + default List<CombinationProductDO> convertList(List<? extends CombinationProductBaseVO> products, CombinationActivityDO activity) {
  83 + return CollectionUtils.convertList(products, item -> convert(activity, item).setActivityStatus(activity.getStatus()));
85 } 84 }
86 85
87 default List<CombinationProductDO> convertList(List<CombinationProductUpdateReqVO> updateProductVOs, 86 default List<CombinationProductDO> convertList(List<CombinationProductUpdateReqVO> updateProductVOs,
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java
  View file @e2a8f7b
@@ -56,22 +56,21 @@ public interface SeckillActivityConvert { @@ -56,22 +56,21 @@ public interface SeckillActivityConvert {
56 return convert1(seckillActivity).setProducts(convertList2(seckillProducts)); 56 return convert1(seckillActivity).setProducts(convertList2(seckillProducts));
57 } 57 }
58 58
59 - // TODO @puhui999：参数改成 activity、product 会不会干净一点哈  
60 @Mappings({ 59 @Mappings({
61 @Mapping(target = "id", ignore = true), 60 @Mapping(target = "id", ignore = true),
62 - @Mapping(target = "activityId", source = "activityDO.id"),  
63 - @Mapping(target = "configIds", source = "activityDO.configIds"),  
64 - @Mapping(target = "spuId", source = "activityDO.spuId"),  
65 - @Mapping(target = "skuId", source = "vo.skuId"),  
66 - @Mapping(target = "seckillPrice", source = "vo.seckillPrice"),  
67 - @Mapping(target = "stock", source = "vo.stock"),  
68 - @Mapping(target = "activityStartTime", source = "activityDO.startTime"),  
69 - @Mapping(target = "activityEndTime", source = "activityDO.endTime") 61 + @Mapping(target = "activityId", source = "activity.id"),
  62 + @Mapping(target = "configIds", source = "activity.configIds"),
  63 + @Mapping(target = "spuId", source = "activity.spuId"),
  64 + @Mapping(target = "skuId", source = "product.skuId"),
  65 + @Mapping(target = "seckillPrice", source = "product.seckillPrice"),
  66 + @Mapping(target = "stock", source = "product.stock"),
  67 + @Mapping(target = "activityStartTime", source = "activity.startTime"),
  68 + @Mapping(target = "activityEndTime", source = "activity.endTime")
70 }) 69 })
71 - SeckillProductDO convert(SeckillActivityDO activityDO, SeckillProductBaseVO vo); 70 + SeckillProductDO convert(SeckillActivityDO activity, SeckillProductBaseVO product);
72 71
73 - default List<SeckillProductDO> convertList(List<? extends SeckillProductBaseVO> products, SeckillActivityDO activityDO) {  
74 - return CollectionUtils.convertList(products, item -> convert(activityDO, item).setActivityStatus(activityDO.getStatus())); 72 + default List<SeckillProductDO> convertList(List<? extends SeckillProductBaseVO> products, SeckillActivityDO activity) {
  73 + return CollectionUtils.convertList(products, item -> convert(activity, item).setActivityStatus(activity.getStatus()));
75 } 74 }
76 75
77 List<SeckillProductRespVO> convertList2(List<SeckillProductDO> productDOs); 76 List<SeckillProductRespVO> convertList2(List<SeckillProductDO> productDOs);