zoujiajian 1 жил өмнө
parent
commit
b8cb78f4fa

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/views/UserBenefitsView.java

@@ -21,6 +21,9 @@ import java.util.List;
 @SearchBean(tables = "user_benefits ub left join goods_don g on g.id = ub.goods_id" +
 		" left join goods_don_sku sku on sku.id = ub.sku_id")
 public class UserBenefitsView {
+	@DbField("ub.id")
+	private Long id;
+
 	/**
 	 * 权益类型
 	 */

+ 6 - 2
netflix-service/src/main/java/com/cyksj/service/order/impl/UserRealOrderBenefitsImpl.java

@@ -18,6 +18,7 @@ import com.cyksj.model.views.UserAvailableGoodsTicketView;
 import com.cyksj.service.exchange.ExchangeCodeService;
 import com.cyksj.service.order.UserRealOrderBenefitsService;
 import com.cyksj.service.relation.GroupRelationClearService;
+import com.cyksj.service.user.UserBindRelationService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
@@ -60,6 +61,8 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 
 	private final UserBenefitsComboRelationRecordMapper userBenefitsComboRelationRecordMapper;
 
+	private final UserBindRelationService userBindRelationService;
+
 	@Override
 	public Boolean getPayRealGoodsBenefits(Long userId, Long orderId, Long yhsId, List<GoodsDonSku> skuIds) {
 		Boolean isReceivedAll = true;
@@ -195,14 +198,15 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 
 	@Override
 	public List<UserAvailableGoodsTicketView> getAvailableBenefitsTickets(Long userId, Long orderId,Long yhsId) {
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		List<UserAvailableGoodsTicketView> ticketViews = beanSearcher.searchAll(UserAvailableGoodsTicketView.class, MapUtils.builder()
-				.field(UserAvailableGoodsTicketView::getUserId, userId)
+				.field(UserAvailableGoodsTicketView::getUserId, userIdList).op(Operator.InList)
 				.field(UserAvailableGoodsTicketView::getDeleted, true)
 				.field(UserAvailableGoodsTicketView::getRealOrderId, orderId)
 				.build());
 		ticketViews.forEach(ticket -> {
 			List<GroupsRelationView> relationViewList = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
-					.field(GroupsRelationView::getUserId, userId)
+					.field(GroupsRelationView::getUserId, userIdList).op(Operator.InList)
 					.field(GroupsRelationView::getYhsId, yhsId)
 					.field(GroupsRelationView::getGoodsId, ticket.getGoodsId())
 					.field(GroupsRelationView::getStatus, GroupsRelation.Status.validity.name())