Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
17101242
Commit
17101242
authored
Feb 10, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
10be319b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
center-order/app/base/api/impl/action/order.js
+1
-1
center-order/app/base/db/metadata/apps/platform.js
+1
-1
center-order/app/base/db/models/dbcorder/orderinfo.js
+1
-2
center-order/app/config/localsettings.js
+4
-4
No files found.
center-order/app/base/api/impl/action/order.js
View file @
17101242
...
...
@@ -25,7 +25,7 @@ class OrderAPI extends APIBase {
async
opActionProcess
(
pobj
,
action_type
,
req
)
{
var
opResult
=
null
;
switch
(
action_type
)
{
case
"
getCAProductListByTypeCode
"
:
//创建订单
case
"
addOrder
"
:
//创建订单
opResult
=
await
this
.
utilsProductSve
.
findByTypeCode
(
pobj
,
pobj
.
actionBody
);
break
;
default
:
...
...
center-order/app/base/db/metadata/apps/platform.js
View file @
17101242
...
...
@@ -28,7 +28,7 @@ module.exports = {
//订单类型
"order_type"
:
{
"zzdd"
:
"自主订单"
,
"dkxd"
:
"代客下单"
},
//订单付款状态
"order_pay_status"
:
{
"dfk"
:
"待付款"
,
"zfpz"
:
"已上传支付凭证"
,
"yfk"
:
"已付款"
,
"bfyfk"
:
"部分已付款"
,
"ddqx"
:
"订单取消"
,
"tkclz"
:
"退款处理中"
,
"bfytk"
:
"部分已退款"
,
"ytk"
:
"已退款"
,
"zfshbtg"
:
"支付审核不通过
"
},
"order_pay_status"
:
{
1
:
"待付款"
,
2
:
"已付款"
,
4
:
"待服务"
,
8
:
"已完成
"
},
//帐户类型( 支付类型)
"pay_account_type"
:
{
"cash"
:
"现金"
,
"bank"
:
"银行"
,
"wx"
:
"微信"
,
"alipay"
:
"支付宝"
,
"other"
:
"其它"
},
//订单服务付款状态
...
...
center-order/app/base/db/models/dbcorder/orderinfo.js
View file @
17101242
...
...
@@ -16,8 +16,7 @@ module.exports = (db, DataTypes) => {
serviceQuantity
:
DataTypes
.
INTEGER
,
// 订单服务数量(即与订单数量相对应)
orderPayStatusName
:
DataTypes
.
STRING
(
50
),
//
orderPayStatus
:{
type
:
DataTypes
.
ENUM
,
values
:
Object
.
keys
(
uiconfig
.
config
.
pdict
.
order_pay_status
),
type
:
DataTypes
.
INTEGER
,
set
:
function
(
val
)
{
this
.
setDataValue
(
"orderPayStatus"
,
val
);
this
.
setDataValue
(
"orderPayStatusName"
,
uiconfig
.
config
.
pdict
.
order_pay_status
[
val
]);
...
...
center-order/app/config/localsettings.js
View file @
17101242
...
...
@@ -6,11 +6,11 @@ var settings={
db
:
8
,
},
database
:{
dbname
:
"center_
channel
"
,
user
:
"
write
"
,
password
:
"
write
"
,
dbname
:
"center_
order
"
,
user
:
"
root
"
,
password
:
"
root
"
,
config
:
{
host
:
'1
92.168.18.237
'
,
host
:
'1
21.36.3.35
'
,
port
:
3306
,
dialect
:
'mysql'
,
operatorsAliases
:
false
,
...
...
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