From fc5df9c0488abdc37b3f464672dc2c41c44b169b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Thu, 3 Sep 2026 18:13:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E-?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86-=E5=AF=B9=E8=B4=A6-=E5=8F=91?= =?UTF-8?q?=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esf-relay/src/server.mjs | 2 + supplied-h5/src/store/user.js | 31 +- .../src/view/joyful-selection/layout.vue | 12 +- .../view/joyful-selection/merchant/index.vue | 32 +- .../joyful-selection/profile/orders/index.vue | 58 ++ supplied-service/package-lock.json | 334 +++++++++++ supplied-service/package.json | 1 + supplied-service/prisma/schema.prisma | 31 +- .../prisma/sql/refund-exchange-invoice.sql | 12 +- supplied-service/prisma/sql/supplier-file.sql | 16 + .../prisma/sql/supplier-invoice-flow.sql | 12 + .../src/controllers/order.controller.ts | 26 +- .../src/controllers/supplier.controller.ts | 20 +- supplied-service/src/dao/order.dao.ts | 12 +- supplied-service/src/server.ts | 31 +- .../src/services/order-push-event.service.ts | 1 - .../services/reconciliation-result.service.ts | 150 +++-- .../src/services/supplier-file.service.ts | 53 ++ .../services/supplier-open-order.service.ts | 535 ++++++++++++------ .../src/services/supplier.service.ts | 64 ++- supplied-service/src/utils/bridge-auth.ts | 12 +- .../src/utils/supplier-open-crypto.ts | 12 +- supplied-service/tools/mock-invoice-pdf.d.ts | 11 + supplied-service/tools/mock-invoice-pdf.js | 42 +- 24 files changed, 1216 insertions(+), 294 deletions(-) create mode 100644 supplied-service/prisma/sql/supplier-file.sql create mode 100644 supplied-service/prisma/sql/supplier-invoice-flow.sql create mode 100644 supplied-service/src/services/supplier-file.service.ts create mode 100644 supplied-service/tools/mock-invoice-pdf.d.ts diff --git a/esf-relay/src/server.mjs b/esf-relay/src/server.mjs index cba117f..f1b8fd9 100644 --- a/esf-relay/src/server.mjs +++ b/esf-relay/src/server.mjs @@ -7,6 +7,8 @@ const addressRoutes = new Map([ ['/supplierOpenApi/pointOrder/queryOrderInfo', '/supplierOpenApi/pointOrder/queryOrderInfo'], ['/supplierOpenApi/pointOrder/queryReconciliationInfo', '/supplierOpenApi/pointOrder/queryReconciliationInfo'], ['/supplierOpenApi/pointOrder/applyForInvoices', '/supplierOpenApi/pointOrder/applyForInvoices'], + ['/supplierOpenApi/pointOrder/queryInvoicesInfo', '/supplierOpenApi/pointOrder/queryInvoicesInfo'], + ['/supplierOpenApi/pointOrder/queryFileBase64Info', '/supplierOpenApi/pointOrder/queryFileBase64Info'], ['/supplierOpenApi/pointOrder/unReconciledMsg', '/supplierOpenApi/pointOrder/unReconciledMsg'], ['/supplierOpenApi/pointOrder/reconciliationResult', '/supplierOpenApi/pointOrder/reconciliationResult'] ]) diff --git a/supplied-h5/src/store/user.js b/supplied-h5/src/store/user.js index 60af0f4..1d2137c 100644 --- a/supplied-h5/src/store/user.js +++ b/supplied-h5/src/store/user.js @@ -20,7 +20,6 @@ const saveUser = data => { export const useUserStore = defineStore('joyfulSelectionUser', { state: () => ({ userId: '', - encryptedParam: '', supplierIdentification: '', supplierId: '', supplierName: '', @@ -54,16 +53,27 @@ export const useUserStore = defineStore('joyfulSelectionUser', { }) this.loaded = true }, - hydrateFromRoute(query = {}) { + async hydrateFromRoute(query = {}) { if (!this.loaded) { this.loadUser() } - const encryptedParam = query.AplParmObjct || query.aplParmObjct || '' + const keyword = query.keyword || new URLSearchParams(window.location.search).get('keyword') || '' + let nextUserId = query.userId || '' - if (encryptedParam) { - this.encryptedParam = encryptedParam - this.userId = '' + if (keyword) { + const sessionKeyword = String(keyword).replace(/ /g, '+') + console.log('[supplier-session] keyword', { + routeKeyword: query.keyword, + searchKeyword: new URLSearchParams(window.location.search).get('keyword') || '', + sessionKeyword + }) + const data = await postFunction('supplier-session', { keyword: sessionKeyword }) + nextUserId = data?.userId || '' + } + + if (nextUserId && nextUserId !== this.userId) { + this.userId = nextUserId this.pointsBalance = 0 } if (!this.supplierIdentification) { @@ -92,10 +102,7 @@ export const useUserStore = defineStore('joyfulSelectionUser', { if (!this.loaded) { this.loadUser() } - if (!this.supplierIdentification || (!this.encryptedParam && this.hasToken)) { - return - } - if (!this.encryptedParam) { + if (!this.userId || !this.supplierIdentification || this.hasToken) { return } if (this.loadingToken && bridgeTokenPromise) { @@ -109,12 +116,10 @@ export const useUserStore = defineStore('joyfulSelectionUser', { } const data = await postFunction('supplier-token', { - AplParmObjct: this.encryptedParam, + userId: this.userId, supplierIdentification: this.supplierIdentification }) - this.userId = data?.userId || '' - this.encryptedParam = '' this.supplierId = data?.supplierId || this.supplierId this.supplierName = data?.supplierName || this.supplierName this.persistUser() diff --git a/supplied-h5/src/view/joyful-selection/layout.vue b/supplied-h5/src/view/joyful-selection/layout.vue index 1234ed9..01d42d6 100644 --- a/supplied-h5/src/view/joyful-selection/layout.vue +++ b/supplied-h5/src/view/joyful-selection/layout.vue @@ -49,15 +49,17 @@ export default { methods: { ...mapActions(useCartStore, ['loadCart']), ...mapActions(useUserStore, ['hydrateFromRoute', 'fetchBridgeToken']), - prepareUserSession() { + async prepareUserSession() { this.sessionLoading = true - this.hydrateFromRoute(this.$route.query) - this.fetchBridgeToken().catch(error => { + try { + await this.hydrateFromRoute(this.$route.query) + await this.fetchBridgeToken() + } catch (error) { console.warn('获取平台授权令牌失败', error) this.$toast(error.message || '供应商验证失败，请稍后再试') - }).finally(() => { + } finally { this.sessionLoading = false - }) + } } } } diff --git a/supplied-h5/src/view/joyful-selection/merchant/index.vue b/supplied-h5/src/view/joyful-selection/merchant/index.vue index e6b6e1a..5092833 100644 --- a/supplied-h5/src/view/joyful-selection/merchant/index.vue +++ b/supplied-h5/src/view/joyful-selection/merchant/index.vue @@ -6,6 +6,7 @@
+
@@ -359,11 +360,26 @@ export default { openShipPopup(item) { this.currentOrder = item this.shipForm = { - crrgBsnNm: item.crrgBsnNm || '', - logisticsOrderId: item.logisticsOrderId || '' + crrgBsnNm: item.crrgBsnNm || '韵达快递', + logisticsOrderId: item.logisticsOrderId || 'YT20260903142053001' } this.showShipPopup = true }, + async quickShipAll() { + await Dialog.confirm({ + title: '确认一键发货？', + message: `将为当前 ${this.orderItems.length} 个待发货订单提交发货。` + }) + await Promise.all(this.orderItems.map(item => postFunction('merchant-order-ship', { + supplierId: this.supplierId, + userId: item.userId, + orderId: item.orderId, + crrgBsnNm: item.crrgBsnNm || '韵达快递', + logisticsOrderId: item.logisticsOrderId || 'YT20260903142053001' + }))) + Toast('批量发货成功') + await this.loadOrders() + }, async submitShip() { if (!this.shipForm.crrgBsnNm || !this.shipForm.logisticsOrderId) { Toast('请填写完整发货信息') @@ -467,6 +483,18 @@ export default { padding: 12px 10px 18px; } +.batch-ship-button { + width: 100%; + height: 38px; + margin-bottom: 12px; + border: 0; + border-radius: 8px; + color: #fff; + font-size: 14px; + font-weight: 700; + background: linear-gradient(90deg, #ff6a2a 0%, #ff4b18 100%); +} + .work-card { position: relative; margin-bottom: 12px; diff --git a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue index bcf1fe2..3f9fafb 100644 --- a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue +++ b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue @@ -15,6 +15,15 @@ + + 一键收货（{{ receivableOrders.length }}） +