|
|
|
@ -2046,7 +2046,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
|
orderInfo.setHjse(hjse.toString()); |
|
|
|
|
} |
|
|
|
|
CommonOrderInfo commonOrderInfo = new CommonOrderInfo(); |
|
|
|
|
commonOrderInfo.setOrderItemInfo(collect); |
|
|
|
|
commonOrderInfo.setOrderItemInfo(orderItemInfos); |
|
|
|
|
commonOrderInfo.setOrderInfo(orderInfo); |
|
|
|
|
return orderMergeService.orderItemMerge(commonOrderInfo,collect); |
|
|
|
|
} |
|
|
|
|