diff --git a/src/api/canteen/canteenHotel.ts b/src/api/supermarket/smHotel.ts similarity index 76% rename from src/api/canteen/canteenHotel.ts rename to src/api/supermarket/smHotel.ts index 3682faf5..35d3da95 100644 --- a/src/api/canteen/canteenHotel.ts +++ b/src/api/supermarket/smHotel.ts @@ -2,7 +2,7 @@ import request from "/@/utils/request" export function fetchList(query?: Object) { return request({ - url: "/canteen/canteenHotel/page", + url: "/supermarket/smHotel/page", method: "get", params: query, }) @@ -10,14 +10,14 @@ export function fetchList(query?: Object) { export function getObj(id?: string) { return request({ - url: "/canteen/canteenHotel/" + id, + url: "/supermarket/smHotel/" + id, method: "get", }) } export function addObj(obj?: Object) { return request({ - url: "/canteen/canteenHotel", + url: "/supermarket/smHotel", method: "post", data: obj, }) @@ -25,7 +25,7 @@ export function addObj(obj?: Object) { export function putObj(obj?: Object) { return request({ - url: "/canteen/canteenHotel", + url: "/supermarket/smHotel", method: "put", data: obj, }) @@ -33,7 +33,7 @@ export function putObj(obj?: Object) { export function delObjs(ids?: Object) { return request({ - url: "/canteen/canteenHotel", + url: "/supermarket/smHotel", method: "delete", data: ids, }) @@ -42,7 +42,7 @@ export function delObjs(ids?: Object) { /** 提交异步导入(立刻返回 taskId) */ export function importExcel(data: FormData) { return request({ - url: "/canteen/canteenHotel/import", + url: "/supermarket/smHotel/import", method: "post", data, headers: { "Content-Type": "multipart/form-data" }, @@ -53,7 +53,7 @@ export function importExcel(data: FormData) { /** 轮询导入进度 */ export function getImportStatus(taskId: string) { return request({ - url: `/canteen/canteenHotel/import/status/${taskId}`, + url: `/supermarket/smHotel/import/status/${taskId}`, method: "get", timeout: 30000, }) @@ -62,7 +62,7 @@ export function getImportStatus(taskId: string) { /** 同步上游酒店信息(智力分销) */ export function syncUpstreamHotel(id: string | number) { return request({ - url: `/canteen/canteenHotel/upstream/sync/${id}`, + url: `/supermarket/smHotel/upstream/sync/${id}`, method: "post", }) } @@ -70,7 +70,7 @@ export function syncUpstreamHotel(id: string | number) { /** 批量同步上游酒店信息 */ export function syncUpstreamHotelBatch(ids: Array) { return request({ - url: "/canteen/canteenHotel/upstream/sync/batch", + url: "/supermarket/smHotel/upstream/sync/batch", method: "post", data: ids, }) @@ -79,7 +79,7 @@ export function syncUpstreamHotelBatch(ids: Array) { /** 上游房型列表 */ export function upstreamRoomTypeList(data: { groupCode: string; hotelCode: string }) { return request({ - url: "/canteen/canteenHotel/upstream/roomTypeList", + url: "/supermarket/smHotel/upstream/roomTypeList", method: "post", data, }) @@ -88,7 +88,7 @@ export function upstreamRoomTypeList(data: { groupCode: string; hotelCode: strin /** 上游产品列表 */ export function upstreamProductList(data: { groupCode: string; hotelCode: string; channelCode?: string }) { return request({ - url: "/canteen/canteenHotel/upstream/productList", + url: "/supermarket/smHotel/upstream/productList", method: "post", data, }) diff --git a/src/api/canteen/canteenHotelCallback.ts b/src/api/supermarket/smHotelCallback.ts similarity index 69% rename from src/api/canteen/canteenHotelCallback.ts rename to src/api/supermarket/smHotelCallback.ts index d8d2de67..3d2c8db4 100644 --- a/src/api/canteen/canteenHotelCallback.ts +++ b/src/api/supermarket/smHotelCallback.ts @@ -2,7 +2,7 @@ import request from "/@/utils/request" export function fetchList(query?: Object) { return request({ - url: "/canteen/canteenHotelCallback/page", + url: "/supermarket/smHotelCallback/page", method: "get", params: query, }) @@ -10,14 +10,14 @@ export function fetchList(query?: Object) { export function getObj(id?: string | number) { return request({ - url: "/canteen/canteenHotelCallback/" + id, + url: "/supermarket/smHotelCallback/" + id, method: "get", }) } export function retryTask(id: string | number) { return request({ - url: `/canteen/canteenHotelCallback/retry/${id}`, + url: `/supermarket/smHotelCallback/retry/${id}`, method: "post", }) } diff --git a/src/api/canteen/canteenHotelMid.ts b/src/api/supermarket/smHotelMid.ts similarity index 65% rename from src/api/canteen/canteenHotelMid.ts rename to src/api/supermarket/smHotelMid.ts index fa4c9d31..be85a1c7 100644 --- a/src/api/canteen/canteenHotelMid.ts +++ b/src/api/supermarket/smHotelMid.ts @@ -2,22 +2,31 @@ import request from "/@/utils/request" export function getPriceConfig() { return request({ - url: "/canteen/canteenHotel/priceConfig", + url: "/supermarket/smHotel/priceConfig", method: "get", }) } export function savePriceConfig(data: Object) { return request({ - url: "/canteen/canteenHotel/priceConfig", + url: "/supermarket/smHotel/priceConfig", method: "put", data, }) } +/** 按当前配置重算全部产品/日历卖价(不动订单) */ +export function resyncSellPrices() { + return request({ + url: "/supermarket/smHotel/priceConfig/resyncSell", + method: "post", + timeout: 300000, + }) +} + export function pullFromUpstream(id: string | number) { return request({ - url: `/canteen/canteenHotel/mid/pull/${id}`, + url: `/supermarket/smHotel/mid/pull/${id}`, method: "post", timeout: 120000, }) @@ -25,7 +34,7 @@ export function pullFromUpstream(id: string | number) { export function pushToDownstream(id: string | number) { return request({ - url: `/canteen/canteenHotel/mid/push/${id}`, + url: `/supermarket/smHotel/mid/push/${id}`, method: "post", timeout: 120000, }) @@ -33,7 +42,7 @@ export function pushToDownstream(id: string | number) { export function pullAndPush(id: string | number) { return request({ - url: `/canteen/canteenHotel/mid/pullAndPush/${id}`, + url: `/supermarket/smHotel/mid/pullAndPush/${id}`, method: "post", timeout: 180000, }) @@ -41,7 +50,7 @@ export function pullAndPush(id: string | number) { export function pullAndPushBatch(ids: Array) { return request({ - url: "/canteen/canteenHotel/mid/pullAndPush/batch", + url: "/supermarket/smHotel/mid/pullAndPush/batch", method: "post", data: ids, timeout: 300000, @@ -55,7 +64,7 @@ export function fetchAuthorizedHotels(query?: { refresh?: boolean }) { return request({ - url: "/canteen/canteenHotel/mid/authorizedHotels", + url: "/supermarket/smHotel/mid/authorizedHotels", method: "get", params: query, timeout: 90000, @@ -64,7 +73,7 @@ export function fetchAuthorizedHotels(query?: { export function importAuthorizedHotels(hotels: Array<{ hotelId: string; hotelName?: string }>) { return request({ - url: "/canteen/canteenHotel/mid/authorizedHotels/import", + url: "/supermarket/smHotel/mid/authorizedHotels/import", method: "post", data: hotels, }) @@ -73,7 +82,7 @@ export function importAuthorizedHotels(hotels: Array<{ hotelId: string; hotelNam /** 同步上游酒店列表 + Redis 差集(异步,立刻返回 logId) */ export function syncHotelList(autoImport = true) { return request({ - url: "/canteen/canteenHotel/mid/syncHotelList", + url: "/supermarket/smHotel/mid/syncHotelList", method: "post", params: { autoImport }, timeout: 30000, @@ -83,7 +92,7 @@ export function syncHotelList(autoImport = true) { /** 查询单次同步进度 */ export function getSyncLog(id: string | number) { return request({ - url: `/canteen/canteenHotel/mid/syncLog/${id}`, + url: `/supermarket/smHotel/mid/syncLog/${id}`, method: "get", }) } @@ -91,7 +100,7 @@ export function getSyncLog(id: string | number) { /** 同步日志分页 */ export function fetchSyncLogPage(query?: Object) { return request({ - url: "/canteen/canteenHotel/mid/syncLog/page", + url: "/supermarket/smHotel/mid/syncLog/page", method: "get", params: query, }) @@ -100,7 +109,7 @@ export function fetchSyncLogPage(query?: Object) { /** 日更时间配置(只读) */ export function fetchSyncSchedule() { return request({ - url: "/canteen/canteenHotel/mid/syncSchedule", + url: "/supermarket/smHotel/mid/syncSchedule", method: "get", }) } @@ -108,7 +117,7 @@ export function fetchSyncSchedule() { /** 差集分页 type=new|offline */ export function fetchHotelDiff(query?: { type?: string; current?: number; size?: number }) { return request({ - url: "/canteen/canteenHotel/mid/hotelDiff", + url: "/supermarket/smHotel/mid/hotelDiff", method: "get", params: query, }) @@ -117,7 +126,7 @@ export function fetchHotelDiff(query?: { type?: string; current?: number; size?: /** 导入差集中的新增酒店 */ export function importDiffNewHotels(limit?: number) { return request({ - url: "/canteen/canteenHotel/mid/hotelDiff/importNew", + url: "/supermarket/smHotel/mid/hotelDiff/importNew", method: "post", params: { limit }, timeout: 180000, @@ -127,7 +136,7 @@ export function importDiffNewHotels(limit?: number) { /** 手动滚一天房价(异步) */ export function rollDailyPrice() { return request({ - url: "/canteen/canteenHotel/mid/rollDailyPrice", + url: "/supermarket/smHotel/mid/rollDailyPrice", method: "post", timeout: 30000, }) @@ -136,17 +145,27 @@ export function rollDailyPrice() { /** 异步拉取全部启用酒店详情(房型+产品+未来房价) */ export function pullAllActiveDetails(limit?: number) { return request({ - url: "/canteen/canteenHotel/mid/pullAllActiveDetails", + url: "/supermarket/smHotel/mid/pullAllActiveDetails", method: "post", params: limit != null ? { limit } : undefined, timeout: 30000, }) } +/** 根据同步日志失败明细,只重试失败酒店(详情/滚价) */ +export function retryFailedFromLog(logId: string | number) { + return request({ + url: "/supermarket/smHotel/mid/retryFailedFromLog", + method: "post", + params: { logId }, + timeout: 30000, + }) +} + /** 酒店详情(房型/产品/日历预览) */ export function getHotelDetail(id: string | number) { return request({ - url: `/canteen/canteenHotel/detail/${id}`, + url: `/supermarket/smHotel/detail/${id}`, method: "get", }) } @@ -154,7 +173,7 @@ export function getHotelDetail(id: string | number) { /** 酒店日历分页 */ export function fetchHotelDaily(id: string | number, query?: Object) { return request({ - url: `/canteen/canteenHotel/detail/${id}/daily`, + url: `/supermarket/smHotel/detail/${id}/daily`, method: "get", params: query, }) diff --git a/src/api/canteen/canteenHotelOrder.ts b/src/api/supermarket/smHotelOrder.ts similarity index 73% rename from src/api/canteen/canteenHotelOrder.ts rename to src/api/supermarket/smHotelOrder.ts index 16a59863..e2da23b2 100644 --- a/src/api/canteen/canteenHotelOrder.ts +++ b/src/api/supermarket/smHotelOrder.ts @@ -2,7 +2,7 @@ import request from "/@/utils/request" export function fetchList(query?: Object) { return request({ - url: "/canteen/canteenHotelOrder/page", + url: "/supermarket/smHotelOrder/page", method: "get", params: query, }) @@ -10,14 +10,14 @@ export function fetchList(query?: Object) { export function getObj(id?: string) { return request({ - url: "/canteen/canteenHotelOrder/" + id, + url: "/supermarket/smHotelOrder/" + id, method: "get", }) } export function cancelOrder(id: string | number, reason?: string) { return request({ - url: `/canteen/canteenHotelOrder/cancel/${id}`, + url: `/supermarket/smHotelOrder/cancel/${id}`, method: "post", data: { reason: reason || "后台取消" }, }) @@ -26,7 +26,7 @@ export function cancelOrder(id: string | number, reason?: string) { /** 后台试下单(调上游) */ export function createAdminOrder(data: Object) { return request({ - url: "/canteen/canteenHotelOrder/create", + url: "/supermarket/smHotelOrder/create", method: "post", data, timeout: 120000, @@ -35,7 +35,7 @@ export function createAdminOrder(data: Object) { export function compensateOrder(id: string | number) { return request({ - url: `/canteen/canteenHotelOrder/compensate/${id}`, + url: `/supermarket/smHotelOrder/compensate/${id}`, method: "post", }) } diff --git a/src/views/canteen/canteenHotelPrice/index.vue b/src/views/canteen/canteenHotelPrice/index.vue deleted file mode 100644 index 90785faf..00000000 --- a/src/views/canteen/canteenHotelPrice/index.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/src/views/canteen/canteenHotel/detail.vue b/src/views/supermarket/smHotel/detail.vue similarity index 93% rename from src/views/canteen/canteenHotel/detail.vue rename to src/views/supermarket/smHotel/detail.vue index 9f65b045..9326ae7a 100644 --- a/src/views/canteen/canteenHotel/detail.vue +++ b/src/views/supermarket/smHotel/detail.vue @@ -4,10 +4,6 @@ {{ hotel.hotelName || "-" }} {{ hotel.hotelCode || "-" }} - {{ hotel.groupCode || "-" }} - {{ hotel.sourceId || "-" }} - {{ hotel.sGroupId || "-" }} - {{ hotel.sHotelId || "-" }} {{ hotel.sheetName || "-" }} {{ hotel.remark || "-" }} @@ -50,7 +46,7 @@ @@ -83,7 +79,7 @@ @@ -127,7 +123,7 @@ - + @@ -157,7 +153,7 @@ plain size="small" :loading="cancelLoading" - v-auth="'canteen_canteenHotelOrder_cancel'" + v-auth="'supermarket_smHotelOrder_cancel'" :disabled="!lastOrder.platformNo || lastOrder.orderStatus === 'CANCELLED'" @click="handleCancelLast" > @@ -167,7 +163,7 @@ @@ -175,9 +171,9 @@ -