Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wenHuaBu_adminServer
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
node_server
wenHuaBu_adminServer
Commits
3448bfd2
Commit
3448bfd2
authored
Nov 05, 2024
by
lixinming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
67899183
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
order.ts
src/biz/member/order.ts
+1
-1
model.ts
src/data/models/model.ts
+1
-0
No files found.
src/biz/member/order.ts
View file @
3448bfd2
...
...
@@ -247,7 +247,7 @@ export async function confirmReceiptPass({id}) {
// if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
if
(
orderInfo
.
confirmReceipt
!=
RECEIPTCONFIRMATION
.
待确认
)
throw
new
BizError
(
ERRORENUM
.
重复提交
,
'发票管理-财务核对页-收款确认'
,
`提交通过时订单已经不是待确认 是
${
orderInfo
.
confirmReceipt
}
`
);
let
updateInfo
:
any
=
{
confirmReceipt
:
RECEIPTCONFIRMATION
.
收款确认
};
let
updateInfo
:
any
=
{
confirmReceipt
:
RECEIPTCONFIRMATION
.
收款确认
,
confirmReceiptMs
:
new
Date
().
valueOf
()
};
if
(
orderInfo
.
invoiceStatus
!=
INVOICESTATUS
.
已开发票
)
updateInfo
.
invoiceStatus
=
INVOICESTATUS
.
未开发票
;
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
...
...
src/data/models/model.ts
View file @
3448bfd2
...
...
@@ -495,6 +495,7 @@ const ModelArray = [
paymentMethod
:
'Number'
,
//付款方式 枚举 PAYMENTTYPE
firstPayExamine
:{
type
:
'Boolean'
,
default
:
false
},
//首次订单的审批开关【待支付页审批开关】
confirmReceipt
:{
type
:
'Number'
,
default
:
0
},
//收款确认【财务核对页收款确认】 RECEIPTCONFIRMATION
confirmReceiptMs
:{
type
:
"Number"
,
default
:
0
},
//审核时间 【同上 财务核对页收款确认之后更新时间】
invoiceStatus
:{
type
:
'Number'
,
default
:
INVOICESTATUS
.
不具备开票条件
,
index
:
true
},
//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
advanceInvoice
:{
type
:
'Boolean'
,
default
:
false
},
//是否提交开票 【个人列表页提交开发票按钮】
newUnitName
:
'String'
,
//单位名称,新发票抬头【变更发票抬头使用】
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment