fix: 多条退款detail合并为单条

This commit is contained in:
张松
2024-11-25 09:51:13 +08:00
parent c01dc329c9
commit 428791a1b6
2 changed files with 3 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
/**
@@ -18,7 +19,7 @@ public class OrderVo {
private String tableName;
private String shopQrcode;
private List<TbOrderDetail> details;
private Collection<TbOrderDetail> details;
private String cartListString;
private String orderNo;

View File

@@ -308,7 +308,7 @@ public class OrderService {
orderVo.setStatus(orderInfo.getStatus());
//TODO 增加商家二维码
orderVo.setShopQrcode(shopInfo.getShopQrcode());
orderVo.setDetails((List<TbOrderDetail>) detailHashMap.values());
orderVo.setDetails(detailHashMap.values());
orderVo.setOrderNo(orderInfo.getOrderNo());
orderVo.setTime(orderInfo.getCreatedAt());
if (orderInfo.getStatus().equals("paying") || orderInfo.getStatus().equals("unpaid")) {