Merge branch 'master' into prod
This commit is contained in:
@@ -149,6 +149,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
Map<String, List<OrderDetailPrintVo>> resultMap = new HashMap<>();
|
Map<String, List<OrderDetailPrintVo>> resultMap = new HashMap<>();
|
||||||
// 遍历订单详情列表
|
// 遍历订单详情列表
|
||||||
for (OrderDetailPrintVo orderDetail : orderDetails) {
|
for (OrderDetailPrintVo orderDetail : orderDetails) {
|
||||||
|
if ("Array".equals(orderDetail.getProGroupInfo())) {
|
||||||
|
orderDetail.setProGroupInfo("[]");
|
||||||
|
}
|
||||||
orderDetail.initGift();
|
orderDetail.initGift();
|
||||||
// 获取当前订单详情的 placeNum
|
// 获取当前订单详情的 placeNum
|
||||||
Integer placeNum = orderDetail.getPlaceNum();
|
Integer placeNum = orderDetail.getPlaceNum();
|
||||||
|
|||||||
Reference in New Issue
Block a user