|
@@ -731,7 +731,6 @@ public class CheckBusiness {
|
|
|
TradeStatusEnum.MealLimitTimes.getName()));
|
|
TradeStatusEnum.MealLimitTimes.getName()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return R.ok();
|
|
return R.ok();
|
|
@@ -981,7 +980,7 @@ public class CheckBusiness {
|
|
|
@NotNull
|
|
@NotNull
|
|
|
private static BigDecimal getDisCountMoney(XfCardLimitedVo cardLimitedVo, ConsumptionBo bo, RemoteDiscountVo remoteDiscountVo) {
|
|
private static BigDecimal getDisCountMoney(XfCardLimitedVo cardLimitedVo, ConsumptionBo bo, RemoteDiscountVo remoteDiscountVo) {
|
|
|
int rateCount = remoteDiscountVo.getRateType().equals(
|
|
int rateCount = remoteDiscountVo.getRateType().equals(
|
|
|
- "0") ? cardLimitedVo.getDayDiscountCount().intValue() : cardLimitedVo.getMealDiscountCount().intValue();
|
|
|
|
|
|
|
+ "1") ? cardLimitedVo.getDayDiscountCount().intValue() : cardLimitedVo.getMealDiscountCount().intValue();
|
|
|
BigDecimal disCountMoney;
|
|
BigDecimal disCountMoney;
|
|
|
BigDecimal consumeMoney = bo.getConsumeMoney();
|
|
BigDecimal consumeMoney = bo.getConsumeMoney();
|
|
|
// 折扣率1
|
|
// 折扣率1
|