Merge branch 'refs/heads/dev' into test
This commit is contained in:
commit
a8d59c1308
|
|
@ -429,7 +429,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||
}
|
||||
|
||||
if (updateCartDTO.getIsGift() != null) {
|
||||
tbCashierCart.setTotalAmount(updateCartDTO.getIsGift() ? BigDecimal.ZERO : tbCashierCart.getTotalAmount());
|
||||
tbCashierCart.setTotalAmount(updateCartDTO.getIsGift() ? tbCashierCart.getPackFee() : tbCashierCart.getTotalAmount());
|
||||
tbCashierCart.setIsGift(updateCartDTO.getIsGift() ? "true" : "false");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue