Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb

src/api/account/padProd.ts

@@ -37,7 +37,15 @@ const API = {
       method: "delete",
       data: data,
     });
-  }
+  },
+  // pad布局列表
+  getLayout() {
+    return request<any>({
+      url: `${baseURL}/layout`,
+      method: "get",
+    });
+  },
+
 }
 export default API;
 

src/api/account/payType.ts

@@ -0,0 +1,78 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/payType";
+const Api = {
+  getList() {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "get",
+    });
+  },
+  get(params: getRequset) {
+    return request<any>({
+      url: `${baseURL}/detail`,
+      method: "get",
+    });
+  },
+  edit(data: payType) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "put",
+      data
+    });
+  },
+  add(data: payType) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data
+    });
+  }
+
+};
+
+export default Api;
+
+interface getRequset {
+  id?: string
+}
+
+export interface payType {
+  /**
+   * 图标
+   */
+  icon?: null | string;
+  /**
+   * 自增id
+   */
+  id?: number | null;
+  /**
+   * 0-不显示1显示
+   */
+  isDisplay?: number | null;
+  /**
+   * 0-非虚拟 1虚拟 virtual
+   */
+  isIdeal?: number | null;
+  /**
+   * 是否打开钱箱
+   */
+  isOpenCashDrawer?: number | null;
+  /**
+   * 0允许退款 1-不允许退款
+   */
+  isRefundable?: number | null;
+  /**
+   * 是否快捷展示1是0否
+   */
+  isShowShortcut?: number | null;
+  /**
+   * 0不是 1是 [系统级支付]
+   */
+  isSystem?: number | null;
+  /**
+   * 排序
+   */
+  sorts?: number | null;
+  [property: string]: any;
+}

src/api/account/table.ts

@@ -3,11 +3,10 @@ import { Account_BaseUrl } from "@/api/config";
 const baseURL = Account_BaseUrl + "/admin/shopTable";
 const API = {
   // 批量生成桌码
-  fasetAdd(num: number) {
+  downloadTableCode(num: number) {
     return request({
-      url: `${baseURL}/code`,
+      url: `${baseURL}/code?num=` + num,
       method: "post",
-      data: { num },
     });
   },
   getList(data: getListRequest) {
@@ -17,6 +16,14 @@ const API = {
       params: data
     });
   },
+  // 获取台桌详情
+  get(id: string | number) {
+    return request({
+      url: `${baseURL}/detail`,
+      method: "get",
+      params: { id }
+    });
+  },
   edit(data: editRequest) {
     return request({
       url: `${baseURL}`,

src/api/order/order.ts

@@ -2,11 +2,11 @@ import request from "@/utils/request";
 import { Order_BaseUrl } from "@/api/config";
 const baseURL = Order_BaseUrl + "/admin/order";
 const OrderApi = {
-  getList(params: getListRequest) {
+  getList(data: getListRequest) {
     return request<any, getListResponse>({
       url: `${baseURL}`,
-      method: "get",
-      params: params,
+      method: "post",
+      data
     });
   },
   add(data: addRequest) {
@@ -16,11 +16,76 @@ const OrderApi = {
       data
     });
   },
+  // 历史订单(多次下单使用)
+  getHistoryList(params: getHistoryListRequest) {
+    return request<any>({
+      url: `${baseURL}/historyOrder`,
+      method: "get",
+      params: params,
+    });
+  },
+  // 订单全额退款 只传订单id
+  refundOrder(data: refundOrderRequest) {
+    return request<any>({
+      url: `${baseURL}/refundOrder`,
+      method: "post",
+      params: data,
+    });
+  },
+
   edit() { },
   delete() { },
 };
 
 export default OrderApi;
+
+export interface refundOrderRequest {
+  /**
+   * 现金退款，是否
+   */
+  cash?: boolean;
+  /**
+   * 自定义退款金额，退款金额 默认为 退单数量*单价 的和
+   * 整单退款 为订单orderAmount
+   * 如果自定义退款金额 则金额不进行校验 直接退款
+   */
+  modify?: boolean;
+  orderId: number;
+  /**
+   * 退单总金额
+   */
+  refundAmount: number;
+  /**
+   * 退单明细
+   * id: orderDetailId
+   * num: 退单数量
+   * returnAmount: 退单金额
+   */
+  refundDetails?: RefundDetail[];
+  refundReason?: string;
+  [property: string]: any;
+}
+
+/**
+* 订单详情 实体类。
+*/
+export interface RefundDetail {
+  id?: number;
+  /**
+   * 退单数量
+   */
+  num?: number;
+  /**
+   * 退单金额
+   */
+  returnAmount?: number;
+  [property: string]: any;
+}
+export interface getHistoryListRequest {
+  orderId?: number;
+  [property: string]: any;
+}
+
 // 订单状态
 export type statusType =
   | "unpaid"

src/api/system/version.ts

@@ -29,10 +29,27 @@ const VersionApi = {
       method: "delete",
     });
   },
+  //获取上传临时凭证
+  getCredentials() {
+    return request<any, ossConfig>({
+      url: `${baseURL}/getCredentials`,
+      method: "get",
+    });
+  },
 };
 
+
+
 export default VersionApi;
 
+export interface ossConfig {
+  accessKeyId: string;
+  accessKeySecret: string;
+  expiration: string;
+  securityToken: number;
+}
+
+
 export interface versionForm {
   /**
    * 版本 id