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
1a93f272
Commit
1a93f272
authored
Mar 08, 2022
by
wp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改店铺名称不一致问题
parent
a8e5415a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
OrderServiceImpl.java
...all/server/front/order/service/impl/OrderServiceImpl.java
+6
-3
No files found.
mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java
View file @
1a93f272
...
@@ -108,6 +108,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
...
@@ -108,6 +108,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
private
final
IRedisService
redisService
;
private
final
IRedisService
redisService
;
private
final
IOrderBindBoxService
orderBindBoxService
;
private
final
IOrderBindBoxService
orderBindBoxService
;
private
final
MerchantIntegralMapper
merchantIntegralMapper
;
private
final
MerchantIntegralMapper
merchantIntegralMapper
;
private
final
IShopService
shopService
;
@Autowired
@Autowired
private
ChainUtil
chainUtil
;
private
ChainUtil
chainUtil
;
...
@@ -144,8 +145,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
...
@@ -144,8 +145,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
orderVO
.
setPayType
(
orderPay
.
getPayType
());
orderVO
.
setPayType
(
orderPay
.
getPayType
());
orderVO
.
setPayTime
(
orderPay
.
getPayTime
());
orderVO
.
setPayTime
(
orderPay
.
getPayTime
());
Merchant
info
=
merchantService
.
info
(
merchantId
);
Merchant
info
=
merchantService
.
info
(
merchantId
);
if
(
info
!=
null
)
{
Shop
shop
=
shopService
.
getByMerchantId
(
merchantId
);
orderVO
.
setEnterpriseName
(
info
.
getEnterpriseName
());
if
(
shop
!=
null
)
{
orderVO
.
setEnterpriseName
(
shop
.
getShopName
());
}
}
orderVO
.
setMerchantId
(
merchantId
);
orderVO
.
setMerchantId
(
merchantId
);
GoodsPromotion
promotion
=
promotionService
.
getByOid
(
oid
);
GoodsPromotion
promotion
=
promotionService
.
getByOid
(
oid
);
...
@@ -1203,11 +1205,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
...
@@ -1203,11 +1205,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
/**
/**
* 用积分支付时,生成积分支付流水记录
* 用积分支付时,生成积分支付流水记录
*
* @param oid
* @param oid
*/
*/
private
void
saveOrderIntegralRecord
(
String
oid
)
{
private
void
saveOrderIntegralRecord
(
String
oid
)
{
Pay
pay
=
payService
.
readByOid
(
oid
);
Pay
pay
=
payService
.
readByOid
(
oid
);
if
(
pay
.
getPayType
()
!=
Pay
.
PAY_TYPE_INTEGRAL
)
{
if
(
pay
.
getPayType
()
!=
Pay
.
PAY_TYPE_INTEGRAL
)
{
return
;
return
;
}
}
/**
/**
...
...
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