|
@@ -231,11 +231,14 @@ export class AiPackageItem extends DataModel<AiPackageItem> {
|
|
|
this._convertTable = {
|
|
this._convertTable = {
|
|
|
id: { clientSide: 'number', serverSide: 'number', clientSideRequired: true },
|
|
id: { clientSide: 'number', serverSide: 'number', clientSideRequired: true },
|
|
|
price: { clientSide: 'number', serverSide: 'string' },
|
|
price: { clientSide: 'number', serverSide: 'string' },
|
|
|
|
|
+ payFruit: { clientSide: 'number', serverSide: 'number' },
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
|
id!: number;
|
|
id!: number;
|
|
|
/** 套餐名称 */
|
|
/** 套餐名称 */
|
|
|
name = '';
|
|
name = '';
|
|
|
|
|
+ /** 支付乡源果 */
|
|
|
|
|
+ payFruit = 0;
|
|
|
/** 价格 */
|
|
/** 价格 */
|
|
|
price = 0;
|
|
price = 0;
|
|
|
}
|
|
}
|
|
@@ -246,7 +249,7 @@ export class AiPackageOrder extends DataModel<AiPackageOrder> {
|
|
|
this._convertTable = {
|
|
this._convertTable = {
|
|
|
id: { clientSide: 'number', serverSide: 'number', clientSideRequired: true },
|
|
id: { clientSide: 'number', serverSide: 'number', clientSideRequired: true },
|
|
|
userId: { clientSide: 'number', serverSide: 'number' },
|
|
userId: { clientSide: 'number', serverSide: 'number' },
|
|
|
- amount: { clientSide: 'number', serverSide: 'number' },
|
|
|
|
|
|
|
+ payFruit: { clientSide: 'number', serverSide: 'number' },
|
|
|
status: { clientSide: 'number', serverSide: 'number' },
|
|
status: { clientSide: 'number', serverSide: 'number' },
|
|
|
orderType: { clientSide: 'number', serverSide: 'number' },
|
|
orderType: { clientSide: 'number', serverSide: 'number' },
|
|
|
payType: { clientSide: 'number', serverSide: 'number' },
|
|
payType: { clientSide: 'number', serverSide: 'number' },
|
|
@@ -262,7 +265,7 @@ export class AiPackageOrder extends DataModel<AiPackageOrder> {
|
|
|
/** 村社ID */
|
|
/** 村社ID */
|
|
|
villageId = 0;
|
|
villageId = 0;
|
|
|
/** 支付金额 */
|
|
/** 支付金额 */
|
|
|
- amount = 0;
|
|
|
|
|
|
|
+ payFruit = 0;
|
|
|
/** 状态: -1=已取消, 0=未支付, 1=已支付, 2=待审核 */
|
|
/** 状态: -1=已取消, 0=未支付, 1=已支付, 2=待审核 */
|
|
|
status = 0;
|
|
status = 0;
|
|
|
/** 支付方式: 1=线上支付, 2=对公付款 */
|
|
/** 支付方式: 1=线上支付, 2=对公付款 */
|
|
@@ -471,7 +474,7 @@ export class OfficialApi extends AppServerRequestModule<DataModel> {
|
|
|
per_page: number,
|
|
per_page: number,
|
|
|
current_page: number,
|
|
current_page: number,
|
|
|
last_page: number,
|
|
last_page: number,
|
|
|
- }>('/village/ai/packageList', '获取AI对话套餐列表', {
|
|
|
|
|
|
|
+ }>('/village/growth/aiTokenPackageList', '获取AI对话套餐列表', {
|
|
|
page,
|
|
page,
|
|
|
pageSize,
|
|
pageSize,
|
|
|
});
|
|
});
|
|
@@ -489,10 +492,11 @@ export class OfficialApi extends AppServerRequestModule<DataModel> {
|
|
|
const res = await this.post<{
|
|
const res = await this.post<{
|
|
|
order: KeyValue,
|
|
order: KeyValue,
|
|
|
pay: WxPayParams,
|
|
pay: WxPayParams,
|
|
|
- }>('/village/ai/package', '升级AI对话套餐', {
|
|
|
|
|
|
|
+ }>('/village/growth/placeOrder', '升级AI对话套餐', {
|
|
|
village_id: villageId,
|
|
village_id: villageId,
|
|
|
package_id: packageId,
|
|
package_id: packageId,
|
|
|
pay_type: payType,
|
|
pay_type: payType,
|
|
|
|
|
+ order_type: 5,
|
|
|
});
|
|
});
|
|
|
const data = res.requireData();
|
|
const data = res.requireData();
|
|
|
return {
|
|
return {
|