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

fix: 增加面厨打

This commit is contained in:
张松 2024-11-28 14:27:15 +08:00
parent 04473738b7
commit be710b8379
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
View File

@ -83,7 +83,7 @@ public class TbCashierCart implements Serializable {
private String unit; private String unit;
private BigDecimal discountSaleAmount; private BigDecimal discountSaleAmount;
private String discountSaleNote; private String discountSaleNote;
private Boolean isPrint; private Integer isPrint;
private String useCouponInfo; private String useCouponInfo;
private int isThirdCoupon; private int isThirdCoupon;

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
View File

@ -57,6 +57,7 @@ public class TbOrderDetail implements Serializable {
private String useCouponInfo; private String useCouponInfo;
private BigDecimal canReturnAmount; private BigDecimal canReturnAmount;
private BigDecimal returnAmount; private BigDecimal returnAmount;
private Integer isPrint;
} }

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java
View File

@ -26,5 +26,5 @@ public class CartVo {
private String masterId; private String masterId;
private String tableId; private String tableId;
private Integer orderId; private Integer orderId;
private Boolean isPrint; private Integer isPrint;
} }

3
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -216,7 +216,7 @@ public class OrderService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result createCart(String masterId, Integer productId, Integer shopId, Integer skuId, BigDecimal number, public Result createCart(String masterId, Integer productId, Integer shopId, Integer skuId, BigDecimal number,
String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, String tableId, Boolean isPrint) { String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, String tableId, Integer isPrint) {
if (number == null) { if (number == null) {
return Result.fail(CodeEnum.PARAM); return Result.fail(CodeEnum.PARAM);
} }
@ -934,6 +934,7 @@ public class OrderService {
saleAmount = saleAmount.add(shopInfo.getTableFee()); saleAmount = saleAmount.add(shopInfo.getTableFee());
} }
orderDetail.setIsPrint(cashierCart.getIsPrint());
orderDetail.setMemberPrice(cashierCart.getMemberPrice()); orderDetail.setMemberPrice(cashierCart.getMemberPrice());
orderDetail.setCreateTime(new Date()); orderDetail.setCreateTime(new Date());
orderDetail.setNum(cashierCart.getNumber()); orderDetail.setNum(cashierCart.getNumber());