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
65c593af
Commit
65c593af
authored
Apr 03, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
31334e11
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+2
-1
CustomerBalanceServiceImpl.java
...cation/user/customer/impl/CustomerBalanceServiceImpl.java
+3
-1
No files found.
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
65c593af
...
@@ -366,7 +366,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -366,7 +366,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
wrapper
.
like
(
OrderManage:
:
getTelephone
,
param
.
getCustomerPhone
());
wrapper
.
like
(
OrderManage:
:
getTelephone
,
param
.
getCustomerPhone
());
}
}
if
(
param
.
getCustomerId
()
!=
null
)
{
if
(
param
.
getCustomerId
()
!=
null
)
{
wrapper
.
eq
(
OrderManage:
:
getOrderUser
,
param
.
getCustomerId
());
wrapper
.
and
(
wrapper2
->
wrapper
.
eq
(
OrderManage:
:
getOrderUser
,
param
.
getCustomerId
())
.
or
(
wrapper3
->
wrapper3
.
eq
(
OrderManage:
:
getPayUser
,
param
.
getCustomerId
())));
}
}
if
(
param
.
getDepartmentId
()
!=
null
)
{
if
(
param
.
getDepartmentId
()
!=
null
)
{
wrapper
.
eq
(
OrderManage:
:
getDepartmentId
,
param
.
getDepartmentId
());
wrapper
.
eq
(
OrderManage:
:
getDepartmentId
,
param
.
getDepartmentId
());
...
...
src/main/java/com/gogirl/application/user/customer/impl/CustomerBalanceServiceImpl.java
View file @
65c593af
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.gogirl.application.order.serve.OrderManageService
;
import
com.gogirl.application.user.customer.CustomerBalanceService
;
import
com.gogirl.application.user.customer.CustomerBalanceService
;
import
com.gogirl.domain.store.store.StoreUser
;
import
com.gogirl.domain.store.store.StoreUser
;
import
com.gogirl.domain.user.customer.CustomerBalance
;
import
com.gogirl.domain.user.customer.CustomerBalance
;
...
@@ -91,6 +92,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
...
@@ -91,6 +92,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
}
}
private
final
UserManageMapper
userManageMapper
;
private
final
UserManageMapper
userManageMapper
;
private
final
OrderManageService
orderManageService
;
@Override
@Override
public
PageInfo
<
CustomerBalanceRecord
>
getBalanceRecordCard
(
Integer
customerId
,
int
pageNum
,
int
pageSize
)
{
public
PageInfo
<
CustomerBalanceRecord
>
getBalanceRecordCard
(
Integer
customerId
,
int
pageNum
,
int
pageSize
)
{
...
@@ -102,7 +104,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
...
@@ -102,7 +104,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
list
.
stream
()
list
.
stream
()
.
filter
(
balanceRecord
->
balanceRecord
.
getType
().
equals
(-
1
))
.
filter
(
balanceRecord
->
balanceRecord
.
getType
().
equals
(-
1
))
.
forEach
(
balanceRecord
->
{
.
forEach
(
balanceRecord
->
{
balanceRecord
.
setOrderManage
(
orderManage
Mapper
.
selectById
(
Integer
.
valueOf
(
balanceRecord
.
getOrderId
())));
balanceRecord
.
setOrderManage
(
orderManage
Service
.
queryOrder
(
Integer
.
valueOf
(
balanceRecord
.
getOrderId
())));
if
(
balanceRecord
.
getOrderAmount
()
!=
null
&&
balanceRecord
.
getOrderAmount
()
!=
0
&&
balanceRecord
.
getOrderManage
()
!=
null
)
{
if
(
balanceRecord
.
getOrderAmount
()
!=
null
&&
balanceRecord
.
getOrderAmount
()
!=
0
&&
balanceRecord
.
getOrderManage
()
!=
null
)
{
balanceRecord
.
getOrderManage
().
setTotalPrice
(
new
BigDecimal
(
balanceRecord
.
getOrderAmount
()).
divide
(
new
BigDecimal
(
100
),
2
,
BigDecimal
.
ROUND_HALF_UP
));
balanceRecord
.
getOrderManage
().
setTotalPrice
(
new
BigDecimal
(
balanceRecord
.
getOrderAmount
()).
divide
(
new
BigDecimal
(
100
),
2
,
BigDecimal
.
ROUND_HALF_UP
));
}
}
...
...
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