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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-12-01 11:36:50 +08:00
parent aec72b98df e5c2c588d6
commit 9f9edec0f6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkOrder.java
View File

@@ -4,17 +4,16 @@ import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table; 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.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; 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;
/** /**
* 自留字段 钱 元/人 * 自留字段 钱 元/人

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class BkOrderServiceImpl extends ServiceImpl<BkOrderMapper, BkOrder> impl
bkOrderEntity.setStatus("待到店"); bkOrderEntity.setStatus("待到店");
bkOrderEntity.setStandardPricePerson(BigDecimal.ZERO); bkOrderEntity.setStandardPricePerson(BigDecimal.ZERO);
if (bkOrderEntity.getStandardPrice() != null && bkOrderEntity.getStandardPrice().compareTo(BigDecimal.ZERO) > 0) { 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 seatNumBd = new BigDecimal(bkOrderEntity.getSeatNum());
BigDecimal bookingTableNumBd = new BigDecimal(bkOrderEntity.getBookingTableNum()); BigDecimal bookingTableNumBd = new BigDecimal(bkOrderEntity.getBookingTableNum());
BigDecimal seatPerTable = seatNumBd.divide(bookingTableNumBd, 2, RoundingMode.HALF_UP); BigDecimal seatPerTable = seatNumBd.divide(bookingTableNumBd, 2, RoundingMode.HALF_UP);