czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java
View File

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

2
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

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