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

代客下单订单同步保存餐位费

Browse Source
This commit is contained in:
SongZhang
2024-09-23 13:28:14 +08:00
parent 3873009e63
commit 1babbfdefe
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java
View File

@@ -231,6 +231,9 @@ public class TbOrderInfo implements Serializable {
@Column(name = "`place_num`") @Column(name = "`place_num`")
@ApiModelProperty(value = "place_num") @ApiModelProperty(value = "place_num")
private Integer placeNum; private Integer placeNum;
@Column(name = "`seat_amount`")
private BigDecimal seatAmount;
public void copy(TbOrderInfo source){ public void copy(TbOrderInfo source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
} }

8
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1003,7 +1003,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
int placeNum = StrUtil.isNotBlank(createOrderDTO.getTableId()) ? getCurrentPlaceNum(createOrderDTO.getTableId(), createOrderDTO.getShopId().toString(), createOrderDTO.getUseType()) : 1; int placeNum = StrUtil.isNotBlank(createOrderDTO.getTableId()) ? getCurrentPlaceNum(createOrderDTO.getTableId(), createOrderDTO.getShopId().toString(), createOrderDTO.getUseType()) : 1;
List<TbOrderDetail> orderDetails = new ArrayList<>(); List<TbOrderDetail> orderDetails = new ArrayList<>();
Integer mealNum = null; BigDecimal mealAmount = null;
boolean unAdd = cashierCarts.stream().noneMatch(item -> item.getPlaceNum() == null); boolean unAdd = cashierCarts.stream().noneMatch(item -> item.getPlaceNum() == null);
if (ShopInfoTypeEnums.RESTAURANT.getValue().equals(shopInfo.getRegisterType()) && addMaterId && unAdd) { if (ShopInfoTypeEnums.RESTAURANT.getValue().equals(shopInfo.getRegisterType()) && addMaterId && unAdd) {
@@ -1011,7 +1011,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
for (TbCashierCart cashierCart : cashierCarts) { for (TbCashierCart cashierCart : cashierCarts) {
if ("-999".equals(cashierCart.getProductId())) { if ("-999".equals(cashierCart.getProductId())) {
mealNum = cashierCart.getNumber(); mealAmount = cashierCart.getTotalAmount();
} }
if (!"return".equals(cashierCart.getStatus())) { if (!"return".equals(cashierCart.getStatus())) {
totalAmount = totalAmount.add(cashierCart.getTotalAmount()); totalAmount = totalAmount.add(cashierCart.getTotalAmount());
@@ -1051,7 +1051,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0 if (shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
&& (OrderUseTypeEnum.DINE_IN_BEFORE.getValue().equals(createOrderDTO.getUseType()) || OrderUseTypeEnum.DINE_IN_AFTER.getValue().equals(createOrderDTO.getUseType())) && (OrderUseTypeEnum.DINE_IN_BEFORE.getValue().equals(createOrderDTO.getUseType()) || OrderUseTypeEnum.DINE_IN_AFTER.getValue().equals(createOrderDTO.getUseType()))
&& mealNum == null) { && mealAmount == null) {
throw new BadRequestException("请选择用餐人数"); throw new BadRequestException("请选择用餐人数");
} }
@@ -1074,6 +1074,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo.setUseType(createOrderDTO.isPostPay() ? "postPay" : "afterPay"); orderInfo.setUseType(createOrderDTO.isPostPay() ? "postPay" : "afterPay");
orderInfo.setUseType(createOrderDTO.getUseType()); orderInfo.setUseType(createOrderDTO.getUseType());
orderInfo.setCreatedAt(DateUtil.current()); orderInfo.setCreatedAt(DateUtil.current());
orderInfo.setSeatAmount(mealAmount);
if (!unAdd) { if (!unAdd) {
orderInfo.setPlaceNum(placeNum); orderInfo.setPlaceNum(placeNum);
} }
@@ -1104,6 +1105,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfo.setTableName(tbShopTable != null ? tbShopTable.getName() : null); orderInfo.setTableName(tbShopTable != null ? tbShopTable.getName() : null);
orderInfo.setPlaceNum(placeNum); orderInfo.setPlaceNum(placeNum);
orderInfo.setUseType(createOrderDTO.getUseType()); orderInfo.setUseType(createOrderDTO.getUseType());
orderInfo.setSeatAmount(mealAmount);
TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>() TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
.eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId()) .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
.eq(TbMerchantAccount::getStatus, 1)); .eq(TbMerchantAccount::getStatus, 1));