Merge branch 'master' into prod

This commit is contained in:
GYJ
2025-03-26 22:20:34 +08:00

View File

@@ -150,7 +150,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
// 遍历订单详情列表 // 遍历订单详情列表
for (OrderDetailPrintVo orderDetail : orderDetails) { for (OrderDetailPrintVo orderDetail : orderDetails) {
if ("Array".equals(orderDetail.getProGroupInfo())) { if ("Array".equals(orderDetail.getProGroupInfo())) {
orderDetail.setProGroupInfo("[]"); orderDetail.setProGroupInfo("");
} }
orderDetail.initGift(); orderDetail.initGift();
// 获取当前订单详情的 placeNum // 获取当前订单详情的 placeNum