@certd/commercial-core 1.40.0 → 1.40.1

package/dist/modules/suite/service/trade-service.js

@@ -0,0 +1,236 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
+import { Repository } from "typeorm";
+import { AccessService, BaseService, SysInstallInfo, SysPaymentSetting, SysSettingsService } from "@certd/lib-server";
+import { ProductEntity, TradeEntity } from "../entity/index.js";
+import dayjs from "dayjs";
+import { utils } from "@certd/basic";
+import { ProductService } from "./product-service.js";
+import { paymentProviderFactory } from "../payments/index.js";
+import { UserSuiteService } from "./user-suite-service.js";
+/**
+ *
+ */
+let TradeService = class TradeService extends BaseService {
+    repository;
+    productService;
+    sysSettingsService;
+    accessService;
+    userSuiteService;
+    getRepository() {
+        return this.repository;
+    }
+    async createFree(req) {
+        const product = await this.getBuyableProduct(req.productId);
+        const { price } = this.findDurationPrice(product, req.duration);
+        if (price !== 0) {
+            throw new Error("产品价格不为0");
+        }
+        const trade = await this.create({
+            productId: req.productId,
+            duration: req.duration,
+            num: req.num,
+            payType: req.payType,
+            userId: req.userId,
+        });
+        //处理支付成功
+        await this.onPaid({
+            tradeNo: trade.tradeNo,
+            status: "paid",
+            amount: 0,
+            payNo: "free",
+            remark: "免费赠送",
+            payTime: dayjs().valueOf(),
+        });
+    }
+    findDurationPrice(product, duration) {
+        const durationPrices = JSON.parse(product.durationPrices || "[]");
+        const durationPrice = durationPrices.find((item) => item.duration === duration);
+        if (!durationPrice) {
+            throw new Error(`产品时长${duration}不存在`);
+        }
+        return durationPrice;
+    }
+    async create(req) {
+        const product = await this.getBuyableProduct(req.productId);
+        const { price } = this.findDurationPrice(product, req.duration);
+        const now = dayjs();
+        const tradeNo = "T" + now.format("YYYYMMDD") + now.unix() + utils.id.randomNumber(6);
+        const title = `购买${product.title} ${req.duration}天`;
+        const desc = `内含：${ProductEntity.getContentStr(product)}`;
+        const trade = new TradeEntity();
+        trade.title = title;
+        trade.desc = desc;
+        trade.productId = req.productId;
+        trade.duration = req.duration;
+        trade.num = req.num;
+        trade.userId = req.userId;
+        trade.tradeNo = tradeNo;
+        trade.duration = req.duration;
+        trade.price = price;
+        trade.title = product.title;
+        //计算总价
+        trade.amount = trade.price * trade.num;
+        trade.status = "wait_pay";
+        trade.payType = req.payType;
+        return await this.repository.save(trade);
+    }
+    async getBuyableProduct(productId) {
+        const product = await this.productService.info(productId);
+        if (!product) {
+            throw new Error("产品不存在");
+        }
+        if (product.disabled) {
+            throw new Error("该产品已下架");
+        }
+        if (!product.supportBuy) {
+            throw new Error("该产品不支持购买");
+        }
+        return product;
+    }
+    async buildPaymentReq(trade, clientIp) {
+        const installInfo = await this.sysSettingsService.getSetting(SysInstallInfo);
+        let bindUrl = installInfo?.bindUrl;
+        if (!bindUrl) {
+            throw new Error("未绑定URL");
+        }
+        if (bindUrl.endsWith("/")) {
+            bindUrl = bindUrl.slice(0, -1);
+        }
+        const payment = await this.getPaymentByType(trade.payType);
+        return await payment.createOrder(trade, { bindUrl, clientIp });
+    }
+    async getPaymentByType(paymentType) {
+        const sysPaymentSetting = await this.sysSettingsService.getSetting(SysPaymentSetting);
+        const paymentConfig = sysPaymentSetting[paymentType];
+        if (!paymentConfig || !paymentConfig.enabled) {
+            throw new Error(`支付方式${paymentType}未启用`);
+        }
+        const access = await this.accessService.getById(paymentConfig.accessId, 0);
+        if (!access) {
+            throw new Error(`支付方式${paymentType}未设置授权`);
+        }
+        return await paymentProviderFactory.createByPaymentType(paymentType, access);
+    }
+    async getByTradeNo(out_trade_no) {
+        if (!out_trade_no) {
+            throw new Error("out_trade_no不能为空");
+        }
+        return await this.repository.findOne({ where: { tradeNo: out_trade_no } });
+    }
+    //支付成功
+    async onPaid(tradeInfo) {
+        const trade = await this.getByTradeNo(tradeInfo.tradeNo);
+        if (!trade) {
+            throw new Error(`订单${tradeInfo.tradeNo}不存在`);
+        }
+        if (trade.status === "paid") {
+            return;
+        }
+        if (trade.status !== "wait_pay") {
+            throw new Error(`订单${tradeInfo.tradeNo}状态不正确, 当前状态为${trade.status}`);
+        }
+        //校验金额
+        if (trade.amount !== tradeInfo.amount) {
+            throw new Error(`订单${tradeInfo.tradeNo}金额不正确, 当前金额为${trade.amount}，实际支付金额为${tradeInfo.amount}`);
+        }
+        //处理支付成功
+        await this.transaction(async (manager) => {
+            //更新订单状态
+            await manager.update(TradeEntity, { id: trade.id }, { status: "paid", amount: tradeInfo.amount, remark: tradeInfo.remark, payNo: tradeInfo.payNo, payTime: tradeInfo.payTime || dayjs().valueOf() });
+            const product = await this.productService.info(trade.productId);
+            if (!product) {
+                throw new Error("产品不存在");
+            }
+            const tradeId = trade.id;
+            const userId = trade.userId;
+            const duration = trade.duration;
+            await this.userSuiteService.productToUserSuite({
+                duration,
+                userId,
+                product,
+                tradeId,
+                entityManager: manager,
+            });
+        });
+    }
+    /**
+     * 同步订单状态
+     * @param id
+     */
+    async syncStatus(id) {
+        const trade = await this.info(id);
+        if (!trade) {
+            throw new Error("订单不存在");
+        }
+        if (trade.status === "paid") {
+            return;
+        }
+        const payment = await this.getPaymentByType(trade.payType);
+        const detail = await payment.getDetail(trade.tradeNo);
+        if (!detail) {
+            throw new Error("订单不存在");
+        }
+        if (detail.status === "paid") {
+            await this.onPaid(detail);
+        }
+        else if (detail.status === "closed") {
+            //关闭订单
+            await this.transaction(async (manager) => {
+                await manager.update(TradeEntity, { id: trade.id }, { status: "closed", remark: detail.remark });
+            });
+        }
+    }
+    async updatePaid(id, userName) {
+        const trade = await this.info(id);
+        if (!trade) {
+            throw new Error("订单不存在");
+        }
+        if (trade.status === "paid") {
+            return;
+        }
+        await this.onPaid({
+            tradeNo: trade.tradeNo,
+            status: "paid",
+            amount: trade.amount,
+            payNo: "",
+            remark: `手动确认支付:${userName}`,
+            payTime: dayjs().valueOf(),
+        });
+    }
+};
+__decorate([
+    InjectEntityModel(TradeEntity),
+    __metadata("design:type", Repository)
+], TradeService.prototype, "repository", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", ProductService)
+], TradeService.prototype, "productService", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", SysSettingsService)
+], TradeService.prototype, "sysSettingsService", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", AccessService)
+], TradeService.prototype, "accessService", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", UserSuiteService)
+], TradeService.prototype, "userSuiteService", void 0);
+TradeService = __decorate([
+    Provide(),
+    Scope(ScopeEnum.Request, { allowDowngrade: true })
+], TradeService);
+export { TradeService };
+//# sourceMappingURL=trade-service.js.map

package/dist/modules/suite/service/trade-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trade-service.js","sourceRoot":"","sources":["../../../../src/modules/suite/service/trade-service.ts"],"names":[],"mappings":"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"}

package/dist/modules/suite/service/user-suite-service.js

@@ -0,0 +1,351 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { InjectEntityModel } from "@midwayjs/typeorm";
+import { Equal, LessThan, MoreThan, Or, Repository } from "typeorm";
+import { BaseService, NeedSuiteException, SysSettingsService, SysSuiteSetting } from "@certd/lib-server";
+import { ProductEntity, UserSuiteEntity } from "../entity/index.js";
+import dayjs from "dayjs";
+import { ProductService } from "./product-service.js";
+import { logger, utils } from "@certd/basic";
+import { checkComm, isComm } from "@certd/plus-core";
+/**
+ */
+let UserSuiteService = class UserSuiteService extends BaseService {
+    repository;
+    myCountService;
+    sysSettingsService;
+    productService;
+    getRepository() {
+        return this.repository;
+    }
+    async presentGiftSuite(userId) {
+        if (userId == null) {
+            return false;
+        }
+        if (!isComm()) {
+            return false;
+        }
+        const suiteSetting = await this.getSuiteSetting();
+        if (!suiteSetting) {
+            return false;
+        }
+        if (!suiteSetting.enabled) {
+            return false;
+        }
+        if (!suiteSetting.registerGift?.productId) {
+            return false;
+        }
+        return await utils.locker.execute(`presentGiftSuite:${userId}`, async () => {
+            const count = await this.getRepository().count({
+                where: {
+                    userId: userId,
+                    isPresent: true,
+                },
+            });
+            if (count > 0) {
+                return false;
+            }
+            // 赠送套餐
+            const giftSuite = await this.productService.info(suiteSetting.registerGift.productId);
+            if (!giftSuite) {
+                return false;
+            }
+            logger.info(`注册赠送套餐:userId=${userId},suite=${giftSuite.title}`);
+            await this.productToUserSuite({
+                userId,
+                product: giftSuite,
+                duration: suiteSetting.registerGift.duration,
+                isPresent: true,
+                isBootstrap: true,
+            });
+            return true;
+        });
+    }
+    async productToUserSuite(req) {
+        const { duration, userId, product, tradeId, entityManager } = req;
+        const activeDayjs = dayjs();
+        const activeTime = activeDayjs.valueOf();
+        let expiresTime = 0;
+        if (duration === -1) {
+            //永久
+            expiresTime = -1;
+        }
+        else {
+            expiresTime = activeDayjs.add(duration, "day").endOf("day").valueOf();
+        }
+        const us = new UserSuiteEntity();
+        us.userId = userId;
+        us.productId = product.id;
+        us.tradeId = tradeId || 0;
+        us.icon = "";
+        us.title = product.title;
+        us.productType = product.type;
+        us.content = product.content;
+        us.duration = duration;
+        // us.num = trade.num;
+        us.deployCountUsed = 0;
+        us.disabled = false;
+        us.activeTime = activeTime;
+        us.expiresTime = expiresTime;
+        us.isPresent = req.isPresent || false;
+        us.isBootstrap = req.isBootstrap || false;
+        us.isEmpty = false;
+        if (entityManager) {
+            await entityManager.save(us);
+        }
+        else {
+            await this.getRepository().save(us);
+        }
+    }
+    async getMySuiteDetail(useId) {
+        const suiteSetting = await this.sysSettingsService.getSetting(SysSuiteSetting);
+        let validList = await this.getMyValidSuiteList(useId);
+        if (!validList || validList.length === 0) {
+            //检查是否有过赠送套餐
+            const present = await this.presentGiftSuite(useId);
+            if (present) {
+                validList = await this.getMyValidSuiteList(useId);
+            }
+        }
+        if (!validList || validList.length === 0) {
+            validList = [];
+        }
+        const pipelineCount = { max: 0, used: 0 };
+        const domainCount = { max: 0, used: 0 };
+        const wildcardDomainCount = { max: 0, used: 0 };
+        const deployCount = { max: 0, used: 0 };
+        const monitorCount = { max: 0, used: 0 };
+        const suites = [];
+        const expiresTime = 0;
+        if (validList.length > 0) {
+            for (const suite of validList) {
+                suites.push({
+                    id: suite.id,
+                    productId: suite.productId,
+                    duration: suite.duration,
+                    title: suite.title,
+                    expiresTime: suite.expiresTime,
+                    productType: suite.productType,
+                });
+                const content = UserSuiteEntity.getContent(suite);
+                if (pipelineCount.max == -1 || content.maxPipelineCount == -1) {
+                    pipelineCount.max = -1;
+                }
+                else {
+                    pipelineCount.max += content.maxPipelineCount ?? 0;
+                }
+                if (domainCount.max == -1 || content.maxDomainCount == -1) {
+                    domainCount.max = -1;
+                }
+                else {
+                    domainCount.max += content.maxDomainCount ?? 0;
+                }
+                if (wildcardDomainCount.max == -1 || content.maxWildcardDomainCount == -1) {
+                    wildcardDomainCount.max = -1;
+                }
+                else {
+                    wildcardDomainCount.max += content.maxWildcardDomainCount ?? 0;
+                }
+                if (deployCount.max == -1 || content.maxDeployCount == -1) {
+                    deployCount.max = -1;
+                }
+                else {
+                    deployCount.max += content.maxDeployCount ?? 0;
+                }
+                if (monitorCount.max == -1 || content.maxMonitorCount == -1) {
+                    monitorCount.max = -1;
+                }
+                else {
+                    monitorCount.max += content.maxMonitorCount ?? 0;
+                }
+                deployCount.used += suite.deployCountUsed ?? 0;
+            }
+        }
+        const { pipelineCountUsed, domainCountUsed, wildcardDomainCountUsed, monitorCountUsed } = await this.myCountService.getUsedCount(useId);
+        pipelineCount.used = pipelineCountUsed ?? 0;
+        domainCount.used = domainCountUsed ?? 0;
+        wildcardDomainCount.used = wildcardDomainCountUsed ?? 0;
+        monitorCount.used = monitorCountUsed ?? 0;
+        return {
+            enabled: suiteSetting.enabled,
+            suites,
+            expiresTime,
+            pipelineCount,
+            domainCount,
+            wildcardDomainCount,
+            deployCount,
+            monitorCount,
+        };
+    }
+    async getMyValidSuiteList(userId) {
+        if (userId == null) {
+            throw new Error("用户ID不能为空");
+        }
+        const now = dayjs();
+        const suite = await this.getMyValidSuite(userId, now);
+        const addons = await this.getMyValidAddons(userId, now);
+        if (!suite) {
+            return addons;
+        }
+        return [suite, ...addons];
+    }
+    async getMyValidSuite(userId, now) {
+        return await this.getRepository().findOne({
+            where: {
+                userId: userId,
+                expiresTime: Or(Equal(-1), MoreThan(now.valueOf())),
+                activeTime: LessThan(now.valueOf()),
+                disabled: false,
+                productType: "suite",
+            },
+            order: {
+                id: "DESC",
+            },
+        });
+    }
+    async getMyValidAddons(userId, now) {
+        return await this.getRepository().find({
+            where: {
+                userId: userId,
+                expiresTime: Or(Equal(-1), MoreThan(now.valueOf())),
+                activeTime: LessThan(now.valueOf()),
+                disabled: false,
+                productType: "addon",
+                isEmpty: false,
+            },
+            order: {
+                //先过期的先用
+                expiresTime: "ASC",
+                id: "ASC",
+            },
+        });
+    }
+    async checkHasDeployCount(userId, count = 1) {
+        if (count <= 0) {
+            count = 1;
+        }
+        const suiteSetting = await this.getSuiteSetting();
+        if (!suiteSetting.enabled) {
+            return null;
+        }
+        const suites = await this.getMyValidSuiteList(userId);
+        suites.sort((a, b) => {
+            return a.expiresTime - b.expiresTime;
+        });
+        for (const suite of suites) {
+            const content = UserSuiteEntity.getContent(suite);
+            if (content.maxDeployCount == -1 || content.maxDeployCount >= suite.deployCountUsed + count) {
+                return suite;
+            }
+        }
+        //部署次数不足
+        throw new NeedSuiteException("部署次数不足，请购买加量包或升级套餐");
+    }
+    async consumeDeployCount(suite, count) {
+        if (suite == null) {
+            //无需扣除数量
+            return;
+        }
+        suite.deployCountUsed += count;
+        const content = UserSuiteEntity.getContent(suite);
+        if (content.maxDeployCount != -1 && suite.deployCountUsed >= content.maxDeployCount) {
+            //部署次数用完了
+            const onlyDeployCount = this.isOnlyDeployCount(content);
+            if (onlyDeployCount) {
+                //该套餐包只有部署次数，用完后设置为用完
+                //设置为用完
+                suite.isEmpty = true;
+            }
+        }
+        const update = { deployCountUsed: () => `deployCountUsed + ${count}` };
+        if (suite.isEmpty) {
+            update.isEmpty = true;
+        }
+        await this.repository
+            .createQueryBuilder()
+            .update(UserSuiteEntity)
+            .set(update) // 通过数据库函数直接实现加1操作
+            .where("id = :suiteId", { suiteId: suite.id })
+            .execute();
+    }
+    checkHasInfinite(content) {
+        const keys = Object.keys(content);
+        for (const key of keys) {
+            if (key.startsWith("max")) {
+                if (content[key] == -1) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    getSuiteSetting() {
+        return this.sysSettingsService.getSetting(SysSuiteSetting);
+    }
+    isOnlyDeployCount(content) {
+        const keys = Object.keys(content);
+        for (const key of keys) {
+            if (key.startsWith("max") && key != "maxDeployCount") {
+                if (content[key] != 0) {
+                    return false;
+                }
+            }
+        }
+        if (content.maxDeployCount === -1) {
+            return false;
+        }
+        return true;
+    }
+    async presentSuite(req) {
+        checkComm();
+        const suiteSetting = await this.getSuiteSetting();
+        if (!suiteSetting.enabled) {
+            throw new Error("套餐功能未开启");
+        }
+        const product = await this.productService.info(req.productId);
+        if (!product) {
+            throw new Error("产品不存在");
+        }
+        const dpList = ProductEntity.getDurationPrices(product);
+        const found = dpList.find(dp => dp.duration === req.duration);
+        if (!found) {
+            throw new Error("套餐时长不存在");
+        }
+        await this.productToUserSuite({
+            userId: req.userId,
+            product,
+            duration: found.duration,
+            isPresent: true,
+        });
+    }
+};
+__decorate([
+    InjectEntityModel(UserSuiteEntity),
+    __metadata("design:type", Repository)
+], UserSuiteService.prototype, "repository", void 0);
+__decorate([
+    Inject("myCountService"),
+    __metadata("design:type", Object)
+], UserSuiteService.prototype, "myCountService", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", SysSettingsService)
+], UserSuiteService.prototype, "sysSettingsService", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", ProductService)
+], UserSuiteService.prototype, "productService", void 0);
+UserSuiteService = __decorate([
+    Provide("userSuiteService"),
+    Scope(ScopeEnum.Request, { allowDowngrade: true })
+], UserSuiteService);
+export { UserSuiteService };
+//# sourceMappingURL=user-suite-service.js.map

package/dist/modules/suite/service/user-suite-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-suite-service.js","sourceRoot":"","sources":["../../../../src/modules/suite/service/user-suite-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/commercial-core",
   "private": false,
-  "version": "1.40.0",
+  "version": "1.40.1",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/d/index.d.ts",
@@ -17,10 +17,10 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
-    "@certd/basic": "^1.40.0",
-    "@certd/lib-server": "^1.40.0",
-    "@certd/pipeline": "^1.40.0",
-    "@certd/plus-core": "^1.40.0",
+    "@certd/basic": "^1.40.1",
+    "@certd/lib-server": "^1.40.1",
+    "@certd/pipeline": "^1.40.1",
+    "@certd/plus-core": "^1.40.1",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/koa": "3.20.13",
     "@midwayjs/logger": "3.4.2",
@@ -52,5 +52,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.4.2"
   },
-  "gitHead": "5801f34b3a40cbbd591805e401613b397bec9775"
+  "gitHead": "73996f055bbff996ee776e7788e5a5cb500fc197"
 }

package/rollup.config.js

@@ -10,6 +10,7 @@ export default {
     {
       dir: "dist",
       format: "es",
+      sourcemap: false,
     },
     // {
     //   file: "dist/index.cjs",
@@ -18,10 +19,13 @@ export default {
   ],
   plugins: [
     typescript({
+      tsconfig: "./tsconfig.build.json",
       target: "esnext",
       rootDir: "src",
       declaration: true,
       declarationDir: "dist/d",
+      sourceMap: false,
+      inlineSourceMap: false,
       exclude: ["./node_modules/**", "./src/**/*.vue", "./src/**/*.spec.ts"],
       allowSyntheticDefaultImports: true,
     }),