Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mall-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
yimu
mall-server
Commits
de328a09
Commit
de328a09
authored
Dec 22, 2021
by
wlx@33.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
当前用户提货没有走链,提货的币并没有给商户,只是数据库冻结,用户提货单“确认收货”或“未收货”n天之后,因此不需要在退货时讲商品币由商家还给用户
parent
c049f4c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
DeliveryServiceImpl.java
.../server/admin/order/service/impl/DeliveryServiceImpl.java
+9
-6
No files found.
mall-server-admin/src/main/java/com/fzm/mall/server/admin/order/service/impl/DeliveryServiceImpl.java
View file @
de328a09
...
@@ -209,13 +209,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
...
@@ -209,13 +209,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
if
(!
update
)
{
if
(!
update
)
{
throw
new
MyException
(
MallResponseError
.
UPDATE_FAIL
);
throw
new
MyException
(
MallResponseError
.
UPDATE_FAIL
);
}
}
/**
/**
* 1.调用链上方法将币还给用户 , 成功后,将order_delivery_refund的state改为5退款成功
* 当前用户提货没有走链,提货的币并没有给商户,只是数据库冻结,用户提货单“确认收货”或“未收货”n天之后,因此不需要在退货时讲商品币由商家还给用户
* 2.nft不支持提货
*/
*/
User
user
=
userService
.
getOne
(
new
QueryWrapper
<
User
>().
eq
(
"uid"
,
delivery
.
getUid
()));
// /**
Merchant
merchant
=
merchantService
.
getOne
(
new
QueryWrapper
<
Merchant
>().
eq
(
"merchant_id"
,
delivery
.
getMerchantId
()));
// * 1.调用链上方法将币还给用户 , 成功后,将order_delivery_refund的state改为5退款成功
assetService
.
refundCoinOnChain
(
TranDto
.
TABLE_TYPE_DELIVERY
,
delivery
.
getOrderDeliveryId
(),
delivery
.
getCoin
(),
delivery
.
getNumber
(),
null
,
merchant
.
getTokenIssueAddr
(),
user
.
getAddress
());
// * 2.nft不支持提货
// */
// User user = userService.getOne(new QueryWrapper<User>().eq("uid", delivery.getUid()));
// Merchant merchant = merchantService.getOne(new QueryWrapper<Merchant>().eq("merchant_id", delivery.getMerchantId()));
// assetService.refundCoinOnChain(TranDto.TABLE_TYPE_DELIVERY, delivery.getOrderDeliveryId(), delivery.getCoin(),
// delivery.getNumber(), null, merchant.getTokenIssueAddr(), user.getAddress());
}
}
}
}
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