Forráskód Böngészése

⚙️ 对接购买乡源果接口

快乐的梦鱼 2 hete
szülő
commit
614743f9d2

+ 8 - 4
src/api/light/OfficialApi.ts

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

+ 1 - 0
src/api/light/TreeApi.ts

@@ -961,6 +961,7 @@ export class TreeApi extends AppServerRequestModule<DataModel> {
     const res = await this.post<KeyValue>('/village/growth/placeOrder', '充值乡源果下单', {
       fruit_deposit_id: fruitDepositId,
       village_id: villageId,
+      order_type: 4,
     });
     return transformDataModel<FruitDepositOrderConfirm>(FruitDepositOrderConfirm, res.requireData());
   }

+ 2 - 2
src/pages/home/village/upgrade/buy-ai-token.vue

@@ -67,6 +67,8 @@ import { useSimpleDataLoader } from '@/components/composeabe/loader/SimpleDataLo
 import { ref } from 'vue';
 import { back, backAndCallOnPageBack } from '@/components/utils/PageAction';
 import { showError } from '@/common/composeabe/ErrorDisplay';
+import { useFruitConversion } from '../../composeabe/FruitConverit';
+import { waitTimeOut } from '@imengyu/imengyu-utils';
 import BoxMid from '@/common/components/box/BoxMid.vue';
 import CommonTopBanner from '@/common/components/CommonTopBanner.vue';
 import FrameButton from '@/common/components/FrameButton.vue';
@@ -76,8 +78,6 @@ import OfficialApi, { type AiPackageItem } from '@/api/light/OfficialApi';
 import BuyFruitInfo from './components/BuyFruitInfo.vue';
 import FlexRow from '@/components/layout/FlexRow.vue';
 import Icon from '@/components/basic/Icon.vue';
-import { useFruitConversion } from '../../composeabe/FruitConverit';
-import { waitTimeOut } from '@imengyu/imengyu-utils';
 
 const { requireLoginAsync } = useRequireLogin();
 const { moneyToFruit } = useFruitConversion();