zoujiajian пре 10 месеци
родитељ
комит
88619a94f0

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

@@ -4799,8 +4799,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setGoodsId(upgradeSku.getGoodsId());
 		orderDon.setRelationId(relationId);
 		orderDon.setSkuId(upgradeSku.getId());
-		//续费订单
-		orderDon.setOrderType(2);
+		//抵扣升级订单
+		orderDon.setOrderType(1);
 		BigDecimal price = upgradeSku.getPrice();
 		orderDon.setOriMoney(price);
 		orderDon.setRealMoney(price);

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -367,7 +367,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				}
 				OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
 						.eq(OrderDon::getRelationId, ticket.getRelationId())
-						.eq(OrderDon::getUserId, ticket.getUserId())
+						.in(OrderDon::getUserId, userIds)
 						.eq(OrderDon::getOrderType, 1)
 						.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
 						.orderByDesc(OrderDon::getId)