|
|
@@ -158,7 +158,12 @@ public class UserBenefitsFrontController {
|
|
|
if (type == UserBenefits.Type.RENEW) {
|
|
|
//是否购买过该规格套餐
|
|
|
Long skuId = data.getSkuId();
|
|
|
- fhCount = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class).in(OrderDon::getUserId, userIdList).eq(OrderDon::getSkuId, skuId).notIn(OrderDon::getStatus, Constant.noOrderAllStatus));
|
|
|
+ Number tickets = beanSearcher.searchCount(RenewalView.class, MapUtils.builder()
|
|
|
+ .field(RenewalView::getSkuId, skuId)
|
|
|
+ .field(RenewalView::getUserId, userIdList).op(Operator.InList)
|
|
|
+ .field(RenewalView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
|
|
|
+ .build());
|
|
|
+ fhCount = tickets.intValue();
|
|
|
Integer renewCount = userBenefitsOrderRecordMapper.selectUseComboRecordByUid(userIdList, data.getType(), data.getGoodsId(), data.getSkuId(), Constant.noOrderAllStatus, null);
|
|
|
data.setRenewCount(renewCount);
|
|
|
}
|