zoujiajian 2 lat temu
rodzic
commit
fd2ed24ae7

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/UpgradeOrderDon.java

@@ -45,7 +45,7 @@ public class UpgradeOrderDon extends BaseEntity {
 
     private String transactionId;
 
-        /**
+    /**
      * 时间
      * */
     private Long time;

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

@@ -3205,7 +3205,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		User user = null;
 		Long userId = payRequest.getUserId();
 		if (userId != null) {
-			int noPayCount = upgradeOrderDonMapper.selectCount(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getUserId, userId).eq(UpgradeOrderDon::getPackageId, payRequest.getPackageId())
+			List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+			int noPayCount = upgradeOrderDonMapper.selectCount(Wrappers.lambdaQuery(UpgradeOrderDon.class)
+					.in(UpgradeOrderDon::getUserId, userIdList)
+					.eq(UpgradeOrderDon::getRelationId, payRequest.getRelationId())
 					.eq(UpgradeOrderDon::getStatus, UpgradeOrderDon.Status.noPayment.toString()));
 			if (noPayCount > 0) {
 				throw new BusinessRuntimeException("您有未支付订单.");