Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
dacc75bf
Commit
dacc75bf
authored
Nov 04, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商城订单代理打折
parent
78533c3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
3 deletions
+31
-3
MallOrderPayServiceImpl.java
.../application/order/mall/impl/MallOrderPayServiceImpl.java
+5
-3
MallOrderServiceImpl.java
...irl/application/order/mall/impl/MallOrderServiceImpl.java
+26
-0
No files found.
src/main/java/com/gogirl/application/order/mall/impl/MallOrderPayServiceImpl.java
View file @
dacc75bf
...
...
@@ -63,9 +63,12 @@ public class MallOrderPayServiceImpl implements MallOrderPayService {
private
final
WxProperties
wxProperties
;
private
final
IAgentUserService
agentUserService
;
private
WxPayUnifiedOrderRequest
buildPayParam
(
MallOrder
mallOrder
)
throws
UnknownHostException
{
Customer
customer
=
customerService
.
getById
(
mallOrder
.
getCustomerId
());
//代理打折
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
String
ip
=
Inet4Address
.
getLocalHost
().
getHostAddress
();
...
...
@@ -96,8 +99,7 @@ public class MallOrderPayServiceImpl implements MallOrderPayService {
@Resource
AgentUserMapper
agentUserMapper
;
@Resource
IAgentUserService
agentUserService
;
@Transactional
(
timeout
=
10000
)
@Override
...
...
src/main/java/com/gogirl/application/order/mall/impl/MallOrderServiceImpl.java
View file @
dacc75bf
...
...
@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.gogirl.application.common.IAgentUserService
;
import
com.gogirl.application.order.mall.MallCustomerAddressService
;
import
com.gogirl.application.order.mall.MallOrderDetailService
;
import
com.gogirl.application.order.mall.MallOrderService
;
import
com.gogirl.application.order.mall.MallShoppingCartService
;
import
com.gogirl.application.user.customer.CustomerService
;
import
com.gogirl.domain.common.AgentUser
;
import
com.gogirl.domain.order.mall.*
;
import
com.gogirl.domain.product.mall.MallProduct
;
import
com.gogirl.domain.store.store.StoreManage
;
...
...
@@ -35,6 +38,7 @@ import org.springframework.beans.BeanUtils;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.util.List
;
...
...
@@ -283,6 +287,8 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
});
}
this
.
agentDiscount
(
mallOrder
);
//设置命令结果
cmd
.
setExecutionResult
(
mallOrder
.
getId
());
log
.
info
(
"用户{}下单结束,时间{},耗时{}"
,
cmd
.
getCustomerId
(),
System
.
currentTimeMillis
(),
System
.
currentTimeMillis
()
-
time
);
...
...
@@ -389,6 +395,7 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
});
}
this
.
agentDiscount
(
mallOrder
);
//设置命令结果
cmd
.
setExecutionResult
(
mallOrder
.
getId
());
log
.
info
(
"用户{}下单结束,时间{},耗时{}"
,
cmd
.
getCustomerId
(),
System
.
currentTimeMillis
(),
System
.
currentTimeMillis
()
-
time
);
...
...
@@ -396,6 +403,25 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
}
@Resource
CustomerService
customerService
;
@Resource
IAgentUserService
agentUserService
;
private
void
agentDiscount
(
MallOrder
mallOrder
)
{
Customer
customer
=
customerService
.
getById
(
mallOrder
.
getCustomerId
());
AgentUser
agentUser
=
agentUserService
.
selectByPhone
(
customer
.
getPhone
());
if
(
agentUser
.
getDiscount
().
compareTo
(
BigDecimal
.
ONE
)
<
0
)
{
mallOrder
.
setTotalDiscountAmount
(
mallOrder
.
getTotalAmount
().
multiply
(
BigDecimal
.
ONE
.
subtract
(
agentUser
.
getDiscount
())));
mallOrder
.
setTotalPayAmount
(
mallOrder
.
getTotalAmount
().
multiply
(
agentUser
.
getDiscount
()));
}
else
{
mallOrder
.
setTotalPayAmount
(
mallOrder
.
getTotalAmount
());
}
mallOrderMapper
.
updateById
(
mallOrder
);
}
@Override
public
IPage
<
MallOrder
>
listMallOrderAggregate
(
ListMallOrderRequest
request
)
{
...
...
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