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
c71c7013
Project 'vue-project/liangXing/frontEnd' was moved to 'vue-project/ZhangJian/ZhangJianFrontEnd'. Please update any links and bookmarks that may still have the old path.
Commit
c71c7013
authored
Mar 19, 2024
by
lixinming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
49e4b283
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
order.ts
src/biz/member/order.ts
+4
-10
model.ts
src/data/models/model.ts
+1
-1
No files found.
src/biz/member/order.ts
View file @
c71c7013
...
@@ -266,6 +266,7 @@ export async function backInvoice({id}) {
...
@@ -266,6 +266,7 @@ export async function backInvoice({id}) {
let
updateInfo
:
any
=
{
let
updateInfo
:
any
=
{
invoiceStatus
:
INVOICESTATUS
.
退回
,
invoiceStatus
:
INVOICESTATUS
.
退回
,
advanceInvoice
:
false
,
};
};
if
(
orderInfo
.
state
==
ORDERSTATE
.
已支付
)
updateInfo
.
confirmReceipt
=
RECEIPTCONFIRMATION
.
待确认
if
(
orderInfo
.
state
==
ORDERSTATE
.
已支付
)
updateInfo
.
confirmReceipt
=
RECEIPTCONFIRMATION
.
待确认
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
...
@@ -347,11 +348,7 @@ export async function applicationInvoice({id}) {
...
@@ -347,11 +348,7 @@ export async function applicationInvoice({id}) {
if
(
orderInfo
.
invoiceStatus
==
INVOICESTATUS
.
退回
)
throw
new
BizError
(
ERRORENUM
.
请求已被退回请重新申请
);
if
(
orderInfo
.
invoiceStatus
==
INVOICESTATUS
.
退回
)
throw
new
BizError
(
ERRORENUM
.
请求已被退回请重新申请
);
let
updateInfo
:
any
=
{
invoiceStatus
:
INVOICESTATUS
.
未开发票
};
let
updateInfo
:
any
=
{
invoiceStatus
:
INVOICESTATUS
.
未开发票
};
if
(
orderInfo
.
state
==
ORDERSTATE
.
已支付
)
{
if
(
orderInfo
.
state
!=
ORDERSTATE
.
已支付
)
updateInfo
.
advanceInvoice
=
true
;
updateInfo
.
advanceInvoice
=
false
;
}
else
{
updateInfo
.
advanceInvoice
=
true
;
}
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
...
@@ -368,11 +365,8 @@ export async function reapplyInvoice({id}) {
...
@@ -368,11 +365,8 @@ export async function reapplyInvoice({id}) {
if
(
orderInfo
.
invoiceStatus
!=
INVOICESTATUS
.
退回
)
throw
new
BizError
(
ERRORENUM
.
不满足重新请求条件
);
if
(
orderInfo
.
invoiceStatus
!=
INVOICESTATUS
.
退回
)
throw
new
BizError
(
ERRORENUM
.
不满足重新请求条件
);
let
updateInfo
:
any
=
{
invoiceStatus
:
INVOICESTATUS
.
未开发票
};
let
updateInfo
:
any
=
{
invoiceStatus
:
INVOICESTATUS
.
未开发票
};
if
(
orderInfo
.
state
==
ORDERSTATE
.
已支付
)
{
if
(
orderInfo
.
state
!=
ORDERSTATE
.
已支付
)
updateInfo
.
advanceInvoice
=
true
;
updateInfo
.
advanceInvoice
=
false
;
}
else
{
updateInfo
.
advanceInvoice
=
true
;
}
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
await
updateOneData
(
TABLEENUM
.
订单表
,
{
id
},
updateInfo
);
return
successResult
();
return
successResult
();
...
...
src/data/models/model.ts
View file @
c71c7013
...
@@ -457,7 +457,7 @@ const ModelArray = [
...
@@ -457,7 +457,7 @@ const ModelArray = [
firstPayExamine
:{
type
:
'Boolean'
,
default
:
false
},
//首次订单的审批开关【待支付页审批开关】
firstPayExamine
:{
type
:
'Boolean'
,
default
:
false
},
//首次订单的审批开关【待支付页审批开关】
confirmReceipt
:{
type
:
'Number'
,
default
:
RECEIPTCONFIRMATION
.
待确认
},
//收款确认【财务核对页收款确认】
confirmReceipt
:{
type
:
'Number'
,
default
:
RECEIPTCONFIRMATION
.
待确认
},
//收款确认【财务核对页收款确认】
invoiceStatus
:{
type
:
'Number'
,
default
:
INVOICESTATUS
.
不具备开票条件
,
index
:
true
},
//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
invoiceStatus
:{
type
:
'Number'
,
default
:
INVOICESTATUS
.
不具备开票条件
,
index
:
true
},
//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
advanceInvoice
:{
type
:
'Boolean'
,
default
:
false
},
//是否提
前
开票 【个人列表页提交开发票按钮】
advanceInvoice
:{
type
:
'Boolean'
,
default
:
false
},
//是否提
交
开票 【个人列表页提交开发票按钮】
newUnitName
:
'String'
,
//单位名称,新发票抬头【变更发票抬头使用】
newUnitName
:
'String'
,
//单位名称,新发票抬头【变更发票抬头使用】
newUscc
:
'String'
,
//新统一信用代码【变更发票信用代码使用】
newUscc
:
'String'
,
//新统一信用代码【变更发票信用代码使用】
ct
:
'Number'
,
//订单创建时间
ct
:
'Number'
,
//订单创建时间
...
...
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