test

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/dal/dataobject/apiorder/ApiOrderDO.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
-import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
+import com.luhu.computility.framework.tenant.core.db.TenantBaseDO;
 
 
 /**
 /**
  * api订单 DO
  * api订单 DO
@@ -26,7 +26,7 @@ import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor
-public class ApiOrderDO extends BaseDO {
+public class ApiOrderDO extends TenantBaseDO {
 
 
     /**
     /**
      * 订单ID
      * 订单ID

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/dal/dataobject/userapiusage/UserApiUsageDO.java

@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
-import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
+import com.luhu.computility.framework.tenant.core.db.TenantBaseDO;
 
 
 /**
 /**
  * 用户 API 使用统计 DO
  * 用户 API 使用统计 DO
@@ -21,7 +21,7 @@ import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor
-public class UserApiUsageDO extends BaseDO {
+public class UserApiUsageDO extends TenantBaseDO {
 
 
     /**
     /**
      * 记录ID
      * 记录ID

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/service/apiorder/ApiOrderServiceImpl.java

@@ -46,6 +46,7 @@ import com.luhu.computility.module.apihub.controller.admin.apiorder.vo.*;
 import com.luhu.computility.module.apihub.dal.dataobject.apiorder.ApiOrderDO;
 import com.luhu.computility.module.apihub.dal.dataobject.apiorder.ApiOrderDO;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.util.object.BeanUtils;
 import com.luhu.computility.framework.common.util.object.BeanUtils;
+import com.luhu.computility.framework.tenant.core.util.TenantUtils;
 
 
 import com.luhu.computility.module.apihub.dal.mysql.apiorder.ApiOrderMapper;
 import com.luhu.computility.module.apihub.dal.mysql.apiorder.ApiOrderMapper;
 
 
@@ -455,6 +456,8 @@ public class ApiOrderServiceImpl implements ApiOrderService {
             log.info("[updateOrderPaidByWpgj][APIHub] WPGJ支付成功回调处理完成，API订单ID: {}, WPGJ订单号: {}",
             log.info("[updateOrderPaidByWpgj][APIHub] WPGJ支付成功回调处理完成，API订单ID: {}, WPGJ订单号: {}",
                     apiOrderId, notifyDTO.getOrderId());
                     apiOrderId, notifyDTO.getOrderId());
 
 
+            // 使用订单的租户上下文创建用户 API 使用记录，确保带上 tenant_id
+            TenantUtils.execute(order.getTenantId(), () -> {
                 userApiUsageService.createUserApiUsage(
                 userApiUsageService.createUserApiUsage(
                         new UserApiUsageSaveReqVO().setApiId(order.getApiId())
                         new UserApiUsageSaveReqVO().setApiId(order.getApiId())
                                 .setApiName(order.getApiName())
                                 .setApiName(order.getApiName())
@@ -464,9 +467,10 @@ public class ApiOrderServiceImpl implements ApiOrderService {
                                 .setUsedTimes(0)
                                 .setUsedTimes(0)
                                 .setPackageValidDays(order.getPackageValidDays())
                                 .setPackageValidDays(order.getPackageValidDays())
                                 .setUserId(order.getUserId())
                                 .setUserId(order.getUserId())
-                            .setExpireTime(DateUtil.offsetDay(new Date(), order.getPackageTimes()).toLocalDateTime() )
+                                .setExpireTime(DateUtil.offsetDay(new Date(), order.getPackageTimes()).toLocalDateTime())
                                 .setPackagePrice(order.getPackagePrice())
                                 .setPackagePrice(order.getPackagePrice())
                 );
                 );
+            });
             //log.error("创建用户Api资源包数据------------" + notifyReqDTO.getMerchantOrderId());
             //log.error("创建用户Api资源包数据------------" + notifyReqDTO.getMerchantOrderId());
             log.error("内部支付任务回调 ");
             log.error("内部支付任务回调 ");