refactor(api): 更新 API调用以使用新的请求工具- 将所有 API 调用中的 request-legacy 替换为 request

- 优化部分 API 调用的参数传递方式
- 统一导入 ApiResult 和 PageResult 类型的路径

src/api/shop/shopArticle/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopArticle, ShopArticleParam } from './model';
 

src/api/shop/shopCommissionRole/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopCommissionRole, ShopCommissionRoleParam } from './model';
 

src/api/shop/shopCoupon/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopCoupon, ShopCouponParam } from './model';
 

src/api/shop/shopDealerCapital/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerCapital, ShopDealerCapitalParam } from './model';
 

src/api/shop/shopDealerOrder/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerOrder, ShopDealerOrderParam } from './model';
 

src/api/shop/shopDealerReferee/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerReferee, ShopDealerRefereeParam } from './model';
 

src/api/shop/shopDealerSetting/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerSetting, ShopDealerSettingParam } from './model';
 

src/api/shop/shopDealerUser/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerUser, ShopDealerUserParam } from './model';
 

src/api/shop/shopDealerWithdraw/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerWithdraw, ShopDealerWithdrawParam } from './model';
 

src/api/shop/shopExpress/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopExpress, ShopExpressParam } from './model';
 

src/api/shop/shopExpressTemplate/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopExpressTemplate, ShopExpressTemplateParam } from './model';
 

src/api/shop/shopExpressTemplateDetail/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopExpressTemplateDetail, ShopExpressTemplateDetailParam } from './model';
 

src/api/shop/shopGift/index.ts

@@ -1,6 +1,6 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
-import type { ShopGift, ShopGiftParam, GiftRedeemParam, GiftUseParam } from './model';
+import {ShopGift, ShopGiftParam, GiftRedeemParam, GiftUseParam, QRCodeParam} from './model';
 
 /**
  * 分页查询礼品卡
@@ -196,12 +196,12 @@ export async function exportShopGift(ids?: number[]) {
 }
 
 /**
- * 生成礼品卡核销码
+ * 生成礼品卡核销码(可用)
  */
-export async function generateVerificationCode(giftId: number) {
-  const res = await request.post<ApiResult<{ verificationCode: string; expireTime: string }>>(
-    '/shop/shop-gift/generate-verification-code',
-    { giftId }
+export async function generateVerificationCode(data: QRCodeParam) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/qr-code/create-encrypted-qr-code',
+    data
   );
   if (res.code === 0) {
     return res.data;
@@ -243,3 +243,18 @@ export async function completeVerification(params: {
   }
   return Promise.reject(new Error(res.message));
 }
+
+/**
+ * 解密二维码数据
+ */
+export async function decryptQrData(params: { token: string; encryptedData: string }) {
+  const res = await request.post<ApiResult<string>>(
+    '/qr-code/decrypt-qr-data',
+    params
+  );
+  if (res.code === 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}
+

src/api/shop/shopGift/model/index.ts

@@ -30,6 +30,8 @@ export interface ShopGift {
   validDays?: number;
   // 操作人
   operatorUserId?: number;
+  // 操作人名称
+  operatorUserName?: string;
   // 是否展示
   isShow?: string;
   // 状态 (0未使用 1已使用 2已过期 3已失效)
@@ -84,7 +86,7 @@ export interface ShopGiftParam extends PageParam {
   // 是否过期筛选
   isExpired?: boolean;
   // 排序字段
-  sortBy?: 'createTime' | 'expireTime' | 'faceValue' | 'useTime';
+  sortBy?: 'createTime' | 'expireTime' | 'faceValue' | 'takeTime';
   // 排序方向
   sortOrder?: 'asc' | 'desc';
 }
@@ -104,9 +106,22 @@ export interface GiftRedeemParam {
  */
 export interface GiftUseParam {
   // 礼品卡ID
-  giftId: number;
+  giftId?: number;
   // 使用地址/门店
   useLocation?: string;
   // 使用备注
   useNote?: string;
 }
+
+export interface QRCodeParam {
+  // 二维码数据
+  data?: string;
+  // 二维码尺寸
+  width?: number;
+  // 二维码高度
+  height?: number;
+  // 二维码过期时间
+  expireMinutes?: number;
+  // 业务类型
+  businessType?: string;
+}

src/api/shop/shopGoods/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopGoods, ShopGoodsParam } from './model';
 

src/api/shop/shopGoodsCategory/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopGoodsCategory, ShopGoodsCategoryParam } from './model';
 

src/api/shop/shopGoodsRoleCommission/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import { ShopGoodsRoleCommission, ShopGoodsRoleCommissionParam } from '@/api/shop/shopGoodsRoleCommission/model';
 

src/api/shop/shopGoodsSku/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model';
 import { ShopGoodsSku, ShopGoodsSkuParam } from '@/api/shop/shopGoodsSku/model';

src/api/shop/shopGoodsSpec/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopGoodsSpec, ShopGoodsSpecParam } from './model';
 

src/api/shop/shopMerchant/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchant, ShopMerchantParam } from './model';
 

src/api/shop/shopMerchantAccount/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantAccount, ShopMerchantAccountParam } from './model';
 

src/api/shop/shopMerchantApply/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantApply, ShopMerchantApplyParam } from './model';
 

src/api/shop/shopMerchantCount/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantCount, ShopMerchantCountParam } from './model';
 

src/api/shop/shopMerchantType/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantType, ShopMerchantTypeParam } from './model';
 

src/api/shop/shopOrder/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopOrder, ShopOrderParam, OrderCreateRequest } from './model';
 

src/api/shop/shopOrderGoods/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopOrderGoods, ShopOrderGoodsParam } from './model';
 

src/api/shop/shopSpec/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import { ShopSpec, ShopSpecParam } from '@/api/shop/shopSpec/model';
 

src/api/shop/shopSpecValue/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopSpecValue, ShopSpecValueParam } from './model';
 

src/api/shop/shopUserAddress/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopUserAddress, ShopUserAddressParam } from './model';
 

src/api/shop/shopUserCoupon/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopUserCoupon, ShopUserCouponParam } from './model';
 

src/api/shop/shopUserCoupon/model/index.ts

@@ -43,7 +43,7 @@ export interface ShopUserCoupon {
   // 剩余小时数（后端计算）
   hoursRemaining?: number;
   // 使用时间
-  useTime?: string;
+  takeTime?: string;
   // 使用订单ID
   orderId?: string;
   // 使用订单号

src/api/shop/shopUserReferee/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopUserReferee, ShopUserRefereeParam } from './model';