|
|
@@ -21,7 +21,6 @@ import com.cyksj.mapper.vip.VipGoodsSkuMapper;
|
|
|
import com.cyksj.mapper.vip.VipOrderDonMapper;
|
|
|
import com.cyksj.model.dto.AliPayParams;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
-import com.cyksj.model.manage.views.GroupsRelationView;
|
|
|
import com.cyksj.model.request.AlipayOrderDonReq;
|
|
|
import com.cyksj.model.request.OrderAttach;
|
|
|
import com.cyksj.model.request.VipOrderDonPayReq;
|
|
|
@@ -30,8 +29,6 @@ import com.cyksj.service.pay.AliPayCommonService;
|
|
|
import com.cyksj.service.user.UserBenefitsService;
|
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
-import com.ejlchina.searcher.param.Operator;
|
|
|
-import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -192,10 +189,6 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
|
|
|
if (isDeduct) {
|
|
|
for (VipGoodsSku vipGoodsSku : skus) {
|
|
|
Long skuId = vipGoodsSku.getSkuId();
|
|
|
- beanSearcher.searchFirst(GroupsRelationView.class, MapUtils.builder().field(GroupsRelationView::getSkuId, skuId)
|
|
|
- .field(GroupsRelationView::getUserId, userIdList).op(Operator.InList)
|
|
|
- .field(GroupsRelationView::getExpiryTime, DateTime.now()).op(Operator.GreaterThan)
|
|
|
- .orderBy(GroupsRelationView::getExpiryTime).desc());
|
|
|
}
|
|
|
}
|
|
|
return vipFee;
|