Merge branch 'refs/heads/dev' into test

This commit is contained in:
SongZhang 2024-10-30 17:25:11 +08:00
commit 09872cd71b
1 changed files with 2 additions and 2 deletions

View File

@ -419,10 +419,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (updateCartDTO.getIsPack() != null) {
if (!updateCartDTO.getIsPack()) {
tbCashierCart.setPackFee(BigDecimal.ZERO);
tbCashierCart.setTotalAmount(tbCashierCart.getSalePrice().multiply(BigDecimal.valueOf(tbCashierCart.getNumber())));
tbCashierCart.setTotalAmount(tbCashierCart.getSalePrice().multiply(BigDecimal.valueOf(updateCartDTO.getNum())));
} else {
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()));
}
tbCashierCart.setIsPack(updateCartDTO.getIsPack() ? "true" : "false");