Merge branch 'refs/heads/dev' into test
This commit is contained in:
commit
09872cd71b
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Reference in New Issue