From ecff6794e225ae64230689d1ff552c5d1d835c10 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 1 Dec 2025 11:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/account/entity/BkOrder.java | 13 ++++++------- .../account/service/impl/BkOrderServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkOrder.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkOrder.java index 83058d54a..3c0888eeb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkOrder.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkOrder.java @@ -4,17 +4,16 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -import java.io.Serial; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 预约单 实体类。 * @@ -110,7 +109,7 @@ public class BkOrder implements Serializable { /** * 餐标 元/人 元/桌 字符串表示 */ - private String standardPriceStr; + private String standardPriceType; /** * 自留字段 钱 元/人 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java index 15576459e..ed06cdbd5 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java @@ -58,7 +58,7 @@ public class BkOrderServiceImpl extends ServiceImpl impl bkOrderEntity.setStatus("待到店"); bkOrderEntity.setStandardPricePerson(BigDecimal.ZERO); if (bkOrderEntity.getStandardPrice() != null && bkOrderEntity.getStandardPrice().compareTo(BigDecimal.ZERO) > 0) { - if (bkOrderEntity.getStandardPriceStr().contains("桌")) { + if (bkOrderEntity.getStandardPriceType().contains("桌")) { BigDecimal seatNumBd = new BigDecimal(bkOrderEntity.getSeatNum()); BigDecimal bookingTableNumBd = new BigDecimal(bkOrderEntity.getBookingTableNum()); BigDecimal seatPerTable = seatNumBd.divide(bookingTableNumBd, 2, RoundingMode.HALF_UP);