Skip to content

phsl / api

Go to a project
Commit a337f9df by lijinqi
Options

test

parent 3c8cc0b8
Showing with 23 additions and 22 deletions
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; ...@@ -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; ...@@ -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
...@@ -125,4 +125,4 @@ public class ApiOrderDO extends BaseDO { ...@@ -125,4 +125,4 @@ public class ApiOrderDO extends BaseDO {
private Integer invoiceStatus; private Integer invoiceStatus;
} }
\ No newline at end of file
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; ...@@ -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; ...@@ -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
...@@ -70,4 +70,4 @@ public class UserApiUsageDO extends BaseDO { ...@@ -70,4 +70,4 @@ public class UserApiUsageDO extends BaseDO {
private String remark; private String remark;
} }
\ No newline at end of file
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.*; ...@@ -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,18 +456,21 @@ public class ApiOrderServiceImpl implements ApiOrderService { ...@@ -455,18 +456,21 @@ 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());
userApiUsageService.createUserApiUsage( // 使用订单的租户上下文创建用户 API 使用记录，确保带上 tenant_id
new UserApiUsageSaveReqVO().setApiId(order.getApiId()) TenantUtils.execute(order.getTenantId(), () -> {
.setApiName(order.getApiName()) userApiUsageService.createUserApiUsage(
.setPackageId(order.getPackageId()) new UserApiUsageSaveReqVO().setApiId(order.getApiId())
.setPackageName(order.getPackageName()) .setApiName(order.getApiName())
.setPackageTimes(order.getPackageTimes()) .setPackageId(order.getPackageId())
.setUsedTimes(0) .setPackageName(order.getPackageName())
.setPackageValidDays(order.getPackageValidDays()) .setPackageTimes(order.getPackageTimes())
.setUserId(order.getUserId()) .setUsedTimes(0)
.setExpireTime(DateUtil.offsetDay(new Date(), order.getPackageTimes()).toLocalDateTime() ) .setPackageValidDays(order.getPackageValidDays())
.setPackagePrice(order.getPackagePrice()) .setUserId(order.getUserId())
); .setExpireTime(DateUtil.offsetDay(new Date(), order.getPackageTimes()).toLocalDateTime())
.setPackagePrice(order.getPackagePrice())
);
});
//log.error("创建用户Api资源包数据------------" + notifyReqDTO.getMerchantOrderId()); //log.error("创建用户Api资源包数据------------" + notifyReqDTO.getMerchantOrderId());
log.error("内部支付任务回调 "); log.error("内部支付任务回调 ");
...@@ -516,4 +520,4 @@ public class ApiOrderServiceImpl implements ApiOrderService { ...@@ -516,4 +520,4 @@ public class ApiOrderServiceImpl implements ApiOrderService {
} }
} }
\ No newline at end of file
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