优化下单流程

src/api/shop/shopOrder/index.ts

@@ -118,7 +118,7 @@ export interface WxPayResult {
  */
 export async function createOrder(data: OrderCreateRequest) {
   const res = await request.post<ApiResult<WxPayResult>>(
-    '/shop/shop-order/create',
+    'http://127.0.0.1:9200/api/shop/shop-order',
     data
   );
   if (res.code === 0) {
@@ -128,7 +128,7 @@ export async function createOrder(data: OrderCreateRequest) {
 }
 
 /**
- * 修改订单
+ * 修复订单支付状态
  */
 export async function repairOrder(data: ShopOrder) {
   const res = await request.put<ApiResult<unknown>>(

src/api/shop/shopOrderGoods/index.ts

@@ -0,0 +1,101 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api/index';
+import type { ShopOrderGoods, ShopOrderGoodsParam } from './model';
+
+/**
+ * 分页查询商品信息
+ */
+export async function pageShopOrderGoods(params: ShopOrderGoodsParam) {
+  const res = await request.get<ApiResult<PageResult<ShopOrderGoods>>>(
+    '/shop/shop-order-goods/page',
+    params
+  );
+  if (res.code === 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+/**
+ * 查询商品信息列表
+ */
+export async function listShopOrderGoods(params?: ShopOrderGoodsParam) {
+  const res = await request.get<ApiResult<ShopOrderGoods[]>>(
+    '/shop/shop-order-goods',
+    params
+  );
+  if (res.code === 0 && res.data) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+/**
+ * 添加商品信息
+ */
+export async function addShopOrderGoods(data: ShopOrderGoods) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/shop/shop-order-goods',
+    data
+  );
+  if (res.code === 0) {
+    return res.message;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+/**
+ * 修改商品信息
+ */
+export async function updateShopOrderGoods(data: ShopOrderGoods) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-order-goods',
+    data
+  );
+  if (res.code === 0) {
+    return res.message;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+/**
+ * 删除商品信息
+ */
+export async function removeShopOrderGoods(id?: number) {
+  const res = await request.del<ApiResult<unknown>>(
+    '/shop/shop-order-goods/' + id
+  );
+  if (res.code === 0) {
+    return res.message;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+/**
+ * 批量删除商品信息
+ */
+export async function removeBatchShopOrderGoods(data: (number | undefined)[]) {
+  const res = await request.del<ApiResult<unknown>>(
+    '/shop/shop-order-goods/batch',
+    {
+      data
+    }
+  );
+  if (res.code === 0) {
+    return res.message;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+/**
+ * 根据id查询商品信息
+ */
+export async function getShopOrderGoods(id: number) {
+  const res = await request.get<ApiResult<ShopOrderGoods>>(
+    '/shop/shop-order-goods/' + id
+  );
+  if (res.code === 0 && res.data) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}

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

@@ -0,0 +1,70 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 商品信息
+ */
+export interface ShopOrderGoods {
+  // 自增ID
+  id?: number;
+  // 关联订单表id
+  orderId?: number;
+  // 订单标识
+  orderCode?: string;
+  // 关联商户ID
+  merchantId?: number;
+  // 商户名称
+  merchantName?: string;
+  // 商品封面图
+  image?: string;
+  // 关联商品id
+  goodsId?: number;
+  // 商品名称
+  goodsName?: string;
+  // 商品规格
+  spec?: string;
+  //
+  skuId?: number;
+  // 单价
+  price?: string;
+  // 购买数量
+  totalNum?: number;
+  // 0 未付款 1已付款，2无需付款或占用状态
+  payStatus?: number;
+  // 0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款
+  orderStatus?: number;
+  // 是否免费：0收费、1免费
+  isFree?: string;
+  // 系统版本 0当前版本 其他版本
+  version?: number;
+  // 预约时间段
+  timePeriod?: string;
+  // 预定日期
+  dateTime?: string;
+  // 开场时间
+  startTime?: string;
+  // 结束时间
+  endTime?: string;
+  // 毫秒时间戳
+  timeFlag?: string;
+  // 过期时间
+  expirationTime?: string;
+  // 备注
+  comments?: string;
+  // 用户id
+  userId?: number;
+  // 租户id
+  tenantId?: number;
+  // 更新时间
+  updateTime?: string;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 商品信息搜索条件
+ */
+export interface ShopOrderGoodsParam extends PageParam {
+  id?: number;
+  orderId?: number;
+  keywords?: string;
+}