@@ -2294,7 +2294,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
* 使用优惠营销 订单金额抵扣
*/
public void deductOrderMoney(OrderDon orderDon, CouponUser couponUser, BigDecimal balance, User user, BigDecimal skuMoney, Integer goodsType, BigDecimal gcCash, List<Long> gcpIds, Boolean isAcReduce, Long subsidyId) throws Exception {
- if (gcCash != null && gcCash.compareTo(BigDecimal.ZERO) > 0 && couponUser != null && balance.compareTo(BigDecimal.ZERO) > 0) {
+ if (gcCash != null && gcCash.compareTo(BigDecimal.ZERO) > 0 && couponUser != null && (balance != null && balance.compareTo(BigDecimal.ZERO) > 0)) {
throw BusinessRuntimeException.getInstance("现金卡不能与其他优惠叠加使用");
}
BigDecimal first_money = orderDon.getMoney();