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

fix: 订单保存先付费后付费

This commit is contained in:
张松 2024-11-13 13:23:01 +08:00
parent 2a6013f1dd
commit 261fc2d387
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,6 +251,7 @@ public class TbOrderInfo implements Serializable {
private BigDecimal productCouponDiscountAmount; private BigDecimal productCouponDiscountAmount;
// 满减抵扣金额 // 满减抵扣金额
private BigDecimal fullCouponDiscountAmount; private BigDecimal fullCouponDiscountAmount;
private Integer isPostpaid;
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));

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

@ -1547,6 +1547,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
throw new BadRequestException("商户信息不存在"); throw new BadRequestException("商户信息不存在");
} }
orderInfo.setMerchantId(merchantAccount.getId().toString()); orderInfo.setMerchantId(merchantAccount.getId().toString());
orderInfo.setIsPostpaid(eatTypeInfoDTO.isDineInAfter() ? 1 : 0);
} }
// 更新取餐号 // 更新取餐号
orderInfo.setOutNumber(updateOutNumber(String.valueOf(createOrderDTO.getShopId())).toString()); orderInfo.setOutNumber(updateOutNumber(String.valueOf(createOrderDTO.getShopId())).toString());