Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
q289089000
server
提交
799467e5
S
server
项目概览
q289089000
/
server
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
799467e5
编写于
4月 29, 2021
作者:
q289089000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
4-29
上级
7c58fa1f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
39 addition
and
36 deletion
+39
-36
src/controller/orderdata/orderdata.gateway.ts
src/controller/orderdata/orderdata.gateway.ts
+1
-12
src/controller/orderdata/orderdata.service.ts
src/controller/orderdata/orderdata.service.ts
+0
-6
src/controller/payment/payment.gateway.ts
src/controller/payment/payment.gateway.ts
+37
-11
src/controller/payment/payment.service.ts
src/controller/payment/payment.service.ts
+1
-7
未找到文件。
src/controller/orderdata/orderdata.gateway.ts
浏览文件 @
799467e5
...
...
@@ -147,6 +147,7 @@ export class OrderDataGateway {
@
SubscribeMessage
(
'
OrderDataDel
'
)
Delete
(
client
:
Socket
,
data
:
any
):
Promise
<
ResultDTO
>
{
//判断当前用户等级
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
"
删除
"
,
data
);
let
result
=
new
ResultDTO
();
...
...
@@ -182,18 +183,6 @@ export class OrderDataGateway {
result
.
msg
=
error
.
message
;
reject
(
result
)
})
// let od:OrderData;
// od._id=data;
// console.log("删除o",od);
// let result=new ResultDTO();
// result.ok=1;
// this._od.Delete(od).then(ret=>{
// console.log("删除结果",ret);
// result.data=ret;
// resolve(result)
// })
//判断当前用户等级
})
}
...
...
src/controller/orderdata/orderdata.service.ts
浏览文件 @
799467e5
...
...
@@ -47,14 +47,8 @@ export class OrderDataService {
async
Delete
(
_id
:
string
):
Promise
<
any
>
{
try
{
return
this
.
_model
.
remove
({
'
_id
'
:
_id
})
// return await m.remove(data).then(result=> {
// console.log('del ok',result.ok);
// if(result.ok===1) { return result; }
// return {ok: -1,module };
// });
}
catch
(
e
)
{
console
.
log
(
e
);
//return {ok: -1,module};
}
}
...
...
src/controller/payment/payment.gateway.ts
浏览文件 @
799467e5
...
...
@@ -18,7 +18,7 @@ export class PaymentGateway {
console
.
log
(
'
payment gateway readed.
'
);
}
update
Order
(
_id
):
Promise
<
Orders
>
{
reTotal
Order
(
_id
):
Promise
<
Orders
>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
_payment
.
Get
({
"
orders
"
:
_id
}).
then
(
payList
=>
{
let
totalPayment
=
0
;
...
...
@@ -84,7 +84,7 @@ export class PaymentGateway {
let
result
=
new
ResultDTO
();
this
.
_payment
.
Add
(
data
).
then
(
doc
=>
{
if
(
doc
){
this
.
update
Order
(
doc
.
orders
).
then
(
order
=>
{
this
.
reTotal
Order
(
doc
.
orders
).
then
(
order
=>
{
client
.
emit
(
'
freshOrder
'
,
order
)
})
result
.
ok
=
1
;
...
...
@@ -116,7 +116,7 @@ export class PaymentGateway {
result
.
ok
=
1
;
//判断当前用户等级
this
.
_payment
.
Update
(
data
).
then
(
doc
=>
{
this
.
update
Order
(
doc
.
orders
).
then
(
order
=>
{
this
.
reTotal
Order
(
doc
.
orders
).
then
(
order
=>
{
client
.
emit
(
'
freshOrder
'
,
order
)
})
console
.
log
(
'
UPD
'
,
doc
)
...
...
@@ -131,15 +131,41 @@ export class PaymentGateway {
@
SubscribeMessage
(
'
paymentDelete
'
)
Delete
(
client
:
Socket
,
data
:
any
):
Promise
<
ResultDTO
>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
_payment
.
Delete
(
data
).
then
(
ret
=>
{
this
.
updateOrder
(
ret
.
orders
).
then
(
order
=>
{
client
.
emit
(
'
freshOrder
'
,
order
)
})
})
console
.
log
(
"
删除
"
,
data
);
let
result
=
new
ResultDTO
();
result
.
ok
=
1
;
//判断当前用户等级
resolve
(
result
)
this
.
_payment
.
GetOne
({
'
_id
'
:
data
}).
then
(
doc
=>
{
console
.
log
(
'
查获
'
,
doc
);
if
(
doc
){
this
.
_payment
.
Delete
(
doc
.
_id
).
then
(
ret
=>
{
console
.
log
(
'
del ret
'
,
ret
);
if
(
ret
.
deletedCount
>
0
){
result
.
ok
=
1
;
result
.
msg
=
`已删除数据:
${
ret
.
deletedCount
}
`
;
this
.
reTotalOrder
(
doc
.
orders
).
then
(
order
=>
{
client
.
emit
(
'
freshOrder
'
,
order
)
})
resolve
(
result
);
}
else
{
console
.
log
(
"
无可删除数据
"
);
result
.
ok
=
0
;
result
.
msg
=
"
无可删除数据.
"
resolve
(
result
);
}
})
}
else
{
console
.
log
(
"
无可删除数据
"
);
result
.
ok
=
0
;
result
.
msg
=
"
无可删除数据.
"
resolve
(
result
);
}
}).
catch
(
error
=>
{
result
.
ok
=
0
;
result
.
msg
=
error
.
message
;
reject
(
result
)
})
})
}
...
...
src/controller/payment/payment.service.ts
浏览文件 @
799467e5
...
...
@@ -48,15 +48,9 @@ export class PaymentService {
//创建 Payment
async
Delete
(
thePayment
:
Payment
):
Promise
<
any
>
{
try
{
return
this
.
_model
.
remove
(
thePayment
)
// return await m.remove(data).then(result=> {
// console.log('del ok',result.ok);
// if(result.ok===1) { return result; }
// return {ok: -1,module };
// });
return
this
.
_model
.
remove
({
'
_id
'
:
thePayment
.
_id
})
}
catch
(
e
)
{
console
.
log
(
e
);
//return {ok: -1,module};
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录