|
@@ -561,7 +561,12 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
|
|
|
public List<OrderCreate.OrderItem> convertMallOrder(List<SellOrder> sellOrderList) {
|
|
|
List<OrderCreate.OrderItem> orderItems = new ArrayList<>();
|
|
|
for (SellOrder e : sellOrderList) {
|
|
|
- List<GoodsSub> list = goodsSubService.lambdaQuery().eq(GoodsSub::getGoodsId, e.getParentGoodsId()).list();
|
|
|
+ OrderCreate.OrderItem orderItemCreate = new OrderCreate.OrderItem();
|
|
|
+ orderItemCreate.setProductQuantity(e.getNum());
|
|
|
+ orderItemCreate.setProductSkuId(e.getGoodsSkuId().longValue());
|
|
|
+ orderItemCreate.setRealAmount(e.getExpectAmount());
|
|
|
+ orderItems.add(orderItemCreate);
|
|
|
+ /*List<GoodsSub> list = goodsSubService.lambdaQuery().eq(GoodsSub::getGoodsId, e.getParentGoodsId()).list();
|
|
|
if(CollectionUtils.isEmpty(list)){
|
|
|
throw new RuntimeException("子商品不存在,请联系管理员");
|
|
|
}
|
|
@@ -586,8 +591,8 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
|
|
|
orderItemCreate.setRealAmount(multiply);
|
|
|
waitRemitFee = waitRemitFee.subtract(multiply);
|
|
|
}
|
|
|
- orderItems.add(orderItemCreate);
|
|
|
- }
|
|
|
+ orderItems.add(orderItemCreate);*/
|
|
|
+// }
|
|
|
}
|
|
|
return orderItems;
|
|
|
}
|