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

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
SongZhang
2024-10-30 17:25:11 +08:00
parent f386405aaa d21833b4b2
commit 09872cd71b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,10 +419,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (updateCartDTO.getIsPack() != null) { if (updateCartDTO.getIsPack() != null) {
if (!updateCartDTO.getIsPack()) { if (!updateCartDTO.getIsPack()) {
tbCashierCart.setPackFee(BigDecimal.ZERO); tbCashierCart.setPackFee(BigDecimal.ZERO);
tbCashierCart.setTotalAmount(tbCashierCart.getSalePrice().multiply(BigDecimal.valueOf(tbCashierCart.getNumber()))); tbCashierCart.setTotalAmount(tbCashierCart.getSalePrice().multiply(BigDecimal.valueOf(updateCartDTO.getNum())));
} else { } else {
tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee())); tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee()));
tbCashierCart.setTotalAmount(tbCashierCart.getSalePrice().multiply(BigDecimal.valueOf(tbCashierCart.getNumber())) tbCashierCart.setTotalAmount(tbCashierCart.getSalePrice().multiply(BigDecimal.valueOf(updateCartDTO.getNum()))
.add(tbCashierCart.getPackFee())); .add(tbCashierCart.getPackFee()));
} }
tbCashierCart.setIsPack(updateCartDTO.getIsPack() ? "true" : "false"); tbCashierCart.setIsPack(updateCartDTO.getIsPack() ? "true" : "false");