Commit a337f9df by lijinqi

test

parent 3c8cc0b8
......@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
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
......@@ -26,7 +26,7 @@ import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApiOrderDO extends BaseDO {
public class ApiOrderDO extends TenantBaseDO {
/**
* 订单ID
......
......@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
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
......@@ -21,7 +21,7 @@ import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UserApiUsageDO extends BaseDO {
public class UserApiUsageDO extends TenantBaseDO {
/**
* 记录ID
......
......@@ -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.framework.common.pojo.PageResult;
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;
......@@ -455,6 +456,8 @@ public class ApiOrderServiceImpl implements ApiOrderService {
log.info("[updateOrderPaidByWpgj][APIHub] WPGJ支付成功回调处理完成,API订单ID: {}, WPGJ订单号: {}",
apiOrderId, notifyDTO.getOrderId());
// 使用订单的租户上下文创建用户 API 使用记录,确保带上 tenant_id
TenantUtils.execute(order.getTenantId(), () -> {
userApiUsageService.createUserApiUsage(
new UserApiUsageSaveReqVO().setApiId(order.getApiId())
.setApiName(order.getApiName())
......@@ -464,9 +467,10 @@ public class ApiOrderServiceImpl implements ApiOrderService {
.setUsedTimes(0)
.setPackageValidDays(order.getPackageValidDays())
.setUserId(order.getUserId())
.setExpireTime(DateUtil.offsetDay(new Date(), order.getPackageTimes()).toLocalDateTime() )
.setExpireTime(DateUtil.offsetDay(new Date(), order.getPackageTimes()).toLocalDateTime())
.setPackagePrice(order.getPackagePrice())
);
});
//log.error("创建用户Api资源包数据------------" + notifyReqDTO.getMerchantOrderId());
log.error("内部支付任务回调 ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment