zoujiajian 3 gadi atpakaļ
vecāks
revīzija
1246aa6330

+ 2 - 0
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2110,10 +2110,12 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			List<Long> userIdList = userBindRelationService.getRelationUserIdList(orderDon.getUserId(), null);
 			GroupsRelationExpiryRecord groupsRelationExpiryRecord = groupsRelationExpiryRecordService.getOne(Wrappers.lambdaQuery(GroupsRelationExpiryRecord.class)
 					.in(GroupsRelationExpiryRecord::getUserId, userIdList)
+					.eq(GroupsRelationExpiryRecord::getIsReBuy, false)
 					.eq(GroupsRelationExpiryRecord::getRelationId, orderDon.getRelationId()).last("limit 1"));
 			if (groupsRelationExpiryRecord == null) {
 				List<GroupsRelationExpiryRecord> groupsRelationExpiryRecords = groupsRelationExpiryRecordService.list(Wrappers.lambdaQuery(GroupsRelationExpiryRecord.class)
 						.in(GroupsRelationExpiryRecord::getUserId, userIdList)
+						.eq(GroupsRelationExpiryRecord::getIsReBuy, false)
 						.eq(GroupsRelationExpiryRecord::getGoodsId, orderDon.getGoodsId()));
 				if (CollUtil.isNotEmpty(groupsRelationExpiryRecords)) {
 					groupsRelationExpiryRecords.forEach(data -> {