czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

赠送标识

Browse Source
This commit is contained in:
wangw
2025-11-27 09:51:08 +08:00
parent 9c2133774e
commit 85e4d11d6e
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
View File

@@ -67,6 +67,10 @@ public class OrderDetail implements Serializable {
* 最终单价
*/
private BigDecimal unitPrice;
/**
* 是否赠送 0否 1是
*/
private Integer isGift;
/**
* 折扣金额(商品优惠券抵扣金额)
@@ -195,19 +199,6 @@ public class OrderDetail implements Serializable {
*/
private LocalDateTime foodServeTime;
/**
* 是否赠送 0否 1是
*/
@Column(ignore = true)
private Integer isGift = 0;
public void initGift() {
if (price.compareTo(BigDecimal.ZERO) == 0) {
isGift = 1;
}
}
public BigDecimal getRefundNum() {
return refundNum == null ? BigDecimal.ZERO : refundNum;
}

6
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

@@ -203,7 +203,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
if ("Array".equals(orderDetail.getProGroupInfo())) {
orderDetail.setProGroupInfo("");
}
orderDetail.initGift();
// 获取当前订单详情的 placeNum
Integer placeNum = orderDetail.getPlaceNum();
// 检查 Map 中是否已经存在该 placeNum 对应的列表
@@ -250,7 +249,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
Map<String, List<OrderDetail>> resultMap = new HashMap<>();
// 遍历订单详情列表
for (OrderDetail orderDetail : orderDetails) {
orderDetail.initGift();
// 获取当前订单详情的 placeNum
Integer placeNum = orderDetail.getPlaceNum();
// 检查 Map 中是否已经存在该 placeNum 对应的列表
@@ -926,7 +924,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
public void getOrderAmount(List<OrderDetail> orderDetails, BigDecimalDTO totalAmount, BigDecimalDTO packAmount,
BigDecimalDTO tempAmount, LimitRateDTO limitRate, boolean isAllPack, Integer userAllPack, boolean isVipPrice) {
for (OrderDetail orderDetail : orderDetails) {
if (orderDetail.getDiscountSaleAmount() != null && orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
if (orderDetail.getIsGift() == 1) {
orderDetail.setUnitPrice(BigDecimal.ZERO);
} else if (orderDetail.getDiscountSaleAmount() != null && orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0) {
orderDetail.setUnitPrice(orderDetail.getDiscountSaleAmount());
} else {
if (orderDetail.getIsTimeDiscount() == 1) {

1
cash-service/order-service/src/main/resources/mapper/CashierCartMapper.xml
View File

@@ -12,6 +12,7 @@
cart.is_temporary as isTemporary,
cart.discount_sale_note as discountSaleNote,
cart.is_print as isPrint,
cart.is_gift as isGift,
cart.is_wait_call as isWaitCall,
cart.pro_group_info as proGroupInfo,
cart.remark as remark,