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

修改接口支持打包赠送

This commit is contained in:
SongZhang 2024-10-15 14:07:01 +08:00
parent 5e8e6661b9
commit 1a8a15193e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java
View File

@ -20,5 +20,7 @@ public class UpdateCartDTO {
@Min(0) @Min(0)
private Integer num; private Integer num;
private String note; private String note;
private boolean isPack;
private boolean isGift;
} }

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

@ -371,16 +371,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
tbCashierCart.setSalePrice(productSku.getSalePrice()); tbCashierCart.setSalePrice(productSku.getSalePrice());
tbCashierCart.setTotalAmount(new BigDecimal(updateCartDTO.getNum()).multiply(productSku.getSalePrice())); tbCashierCart.setTotalAmount(new BigDecimal(updateCartDTO.getNum()).multiply(productSku.getSalePrice()));
tbCashierCart.setNote(updateCartDTO.getNote()); tbCashierCart.setNote(updateCartDTO.getNote());
if (tbCashierCart.getIsPack().equals("false")) {
if (!updateCartDTO.isPack()) {
tbCashierCart.setPackFee(BigDecimal.ZERO); tbCashierCart.setPackFee(BigDecimal.ZERO);
} else { } else {
tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee())); tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee()));
tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee())); tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee()));
} }
if (tbCashierCart.getIsGift().equals("true")) { if (updateCartDTO.isGift()) {
tbCashierCart.setTotalAmount(BigDecimal.ZERO); tbCashierCart.setTotalAmount(BigDecimal.ZERO);
} }
tbCashierCart.setIsPack(updateCartDTO.isPack() ? "true" : "false");
tbCashierCart.setIsGift(updateCartDTO.isGift() ? "true" : "false");
tbCashierCart.setTotalNumber(updateCartDTO.getNum()); tbCashierCart.setTotalNumber(updateCartDTO.getNum());
tbCashierCart.setNumber(updateCartDTO.getNum()); tbCashierCart.setNumber(updateCartDTO.getNum());
tbCashierCart.setCategoryId(product.getCategoryId()); tbCashierCart.setCategoryId(product.getCategoryId());