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-16 15:11:53 +08:00
parent 483af5462d
commit 54acf2a0f5
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +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 isPack;
private boolean isGift; private Boolean isGift;
} }

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

@ -372,19 +372,21 @@ public class TbShopTableServiceImpl implements TbShopTableService {
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 (!updateCartDTO.isPack()) { if (updateCartDTO.getIsPack() != null) {
tbCashierCart.setPackFee(BigDecimal.ZERO); if (!updateCartDTO.getIsPack()) {
} else { tbCashierCart.setPackFee(BigDecimal.ZERO);
tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee())); } else {
tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee())); tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee()));
tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee()));
}
tbCashierCart.setIsPack(updateCartDTO.getIsPack() ? "true" : "false");
} }
if (updateCartDTO.isGift()) { if (updateCartDTO.getIsGift() != null && updateCartDTO.getIsGift()) {
tbCashierCart.setTotalAmount(BigDecimal.ZERO); tbCashierCart.setTotalAmount(BigDecimal.ZERO);
tbCashierCart.setIsGift(updateCartDTO.getIsGift() ? "true" : "false");
} }
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());