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
7950542f
Commit
7950542f
authored
Dec 16, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
def1ad05
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
igirl-channel/app/base/db/dao.base.js
+8
-3
igirl-channel/app/base/service/impl/dborder/orderSve.js
+3
-0
No files found.
igirl-channel/app/base/db/dao.base.js
View file @
7950542f
...
@@ -9,6 +9,11 @@ class Dao {
...
@@ -9,6 +9,11 @@ class Dao {
preCreate
(
u
)
{
preCreate
(
u
)
{
return
u
;
return
u
;
}
}
/**
*
* @param {*} u 对象
* @param {*} t 事务对象t
*/
async
create
(
u
,
t
)
{
async
create
(
u
,
t
)
{
var
u2
=
this
.
preCreate
(
u
);
var
u2
=
this
.
preCreate
(
u
);
if
(
t
)
{
if
(
t
)
{
...
@@ -64,7 +69,7 @@ class Dao {
...
@@ -64,7 +69,7 @@ class Dao {
//return {"key":"include","value":{model:this.db.models.app}};
//return {"key":"include","value":{model:this.db.models.app}};
return
[[
"created_at"
,
"DESC"
]];
return
[[
"created_at"
,
"DESC"
]];
}
}
buildAttributes
(){
buildAttributes
()
{
return
[];
return
[];
}
}
buildQuery
(
qobj
)
{
buildQuery
(
qobj
)
{
...
@@ -127,8 +132,8 @@ class Dao {
...
@@ -127,8 +132,8 @@ class Dao {
qc
[
extraFilter
.
key
]
=
extraFilter
.
value
;
qc
[
extraFilter
.
key
]
=
extraFilter
.
value
;
}
}
var
attributesObj
=
this
.
buildAttributes
();
var
attributesObj
=
this
.
buildAttributes
();
if
(
attributesObj
&&
attributesObj
.
length
>
0
)
{
if
(
attributesObj
&&
attributesObj
.
length
>
0
)
{
qc
.
attributes
=
attributesObj
;
qc
.
attributes
=
attributesObj
;
}
}
console
.
log
(
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"
);
console
.
log
(
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"
);
console
.
log
(
qc
);
console
.
log
(
qc
);
...
...
igirl-channel/app/base/service/impl/dborder/orderSve.js
View file @
7950542f
...
@@ -6,6 +6,7 @@ class OrderService extends ServiceBase {
...
@@ -6,6 +6,7 @@ class OrderService extends ServiceBase {
constructor
()
{
constructor
()
{
super
(
"dborder"
,
ServiceBase
.
getDaoName
(
OrderService
));
super
(
"dborder"
,
ServiceBase
.
getDaoName
(
OrderService
));
this
.
logCtl
=
system
.
getObject
(
"web.common.oplogCtl"
);
this
.
logCtl
=
system
.
getObject
(
"web.common.oplogCtl"
);
this
.
orderflowDao
=
system
.
getObject
(
"db.dbapp.orderflowDao"
);
this
.
appproductDao
=
system
.
getObject
(
"db.dbapp.appproductDao"
);
this
.
appproductDao
=
system
.
getObject
(
"db.dbapp.appproductDao"
);
this
.
ordertmproductDao
=
system
.
getObject
(
"db.dborder.ordertmproductDao"
);
this
.
ordertmproductDao
=
system
.
getObject
(
"db.dborder.ordertmproductDao"
);
this
.
receiptvoucherDao
=
system
.
getObject
(
"db.dborder.receiptvoucherDao"
);
this
.
receiptvoucherDao
=
system
.
getObject
(
"db.dborder.receiptvoucherDao"
);
...
@@ -135,6 +136,8 @@ class OrderService extends ServiceBase {
...
@@ -135,6 +136,8 @@ class OrderService extends ServiceBase {
return
await
this
.
db
.
transaction
(
async
function
(
t
)
{
return
await
this
.
db
.
transaction
(
async
function
(
t
)
{
await
self
.
dao
.
updateByWhere
({
orderPayStatus
:
payStatus
,
buyerMoblie
:
action_body
.
buyerMoblie
||
""
},
{
where
:
{
needNoOrderNo
:
action_body
.
needNoOrderNo
,
app_id
:
req
.
app
.
id
}
},
t
);
await
self
.
dao
.
updateByWhere
({
orderPayStatus
:
payStatus
,
buyerMoblie
:
action_body
.
buyerMoblie
||
""
},
{
where
:
{
needNoOrderNo
:
action_body
.
needNoOrderNo
,
app_id
:
req
.
app
.
id
}
},
t
);
await
self
.
ordertmproductDao
.
updateByWhere
({
payStatus
:
payStatus
},
{
where
:
{
needNoOrderNo
:
action_body
.
needNoOrderNo
,
app_id
:
req
.
app
.
id
}
},
t
);
await
self
.
ordertmproductDao
.
updateByWhere
({
payStatus
:
payStatus
},
{
where
:
{
needNoOrderNo
:
action_body
.
needNoOrderNo
,
app_id
:
req
.
app
.
id
}
},
t
);
var
logMsg
=
{
sourceOrderNo
:
result
.
deliveryOrderNo
,
opContent
:
"订单已成功支付"
,
app_id
:
req
.
app
.
id
};
await
self
.
orderflowDao
.
create
(
logMsg
,
t
);
return
system
.
getResultSuccess
({
deliveryOrderNo
:
result
.
deliveryOrderNo
});
return
system
.
getResultSuccess
({
deliveryOrderNo
:
result
.
deliveryOrderNo
});
});
});
}
}
...
...
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