|
@@ -194,6 +194,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
|
|
|
List<OrderSku> tempOrderSkuList = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id));
|
|
|
List<OrderSkuVo> orderSkuList = BeanUtil.copyToList(tempOrderSkuList, OrderSkuVo.class);
|
|
|
+
|
|
|
+
|
|
|
+ if (orderInfo.getType().equals(2)) {
|
|
|
+ orderSkuList.forEach(item -> item.setQuantity(BigDecimal.ZERO));
|
|
|
+ }
|
|
|
+
|
|
|
skuSpecService.attributeAssign(orderSkuList, OrderSkuVo::getSkuSpecId, (item, skuSpec) -> {
|
|
|
item.setName(skuSpec.getName());
|
|
|
item.setCode(skuSpec.getCode());
|
|
@@ -232,6 +238,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
item.setCode(bomSpec.getCode());
|
|
|
item.setName(bomSpec.getName());
|
|
|
});
|
|
|
+ result.setOrderPackageList(orderPackageList);
|
|
|
|
|
|
return result;
|
|
|
}
|