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
a716b031
Commit
a716b031
authored
Jul 24, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户消费记录
parent
264b2360
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
13 deletions
+3
-13
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+2
-6
OrderManageController.java
.../gogirl/interfaces/order/serve/OrderManageController.java
+0
-6
CustomerOrder.java
src/main/java/com/gogirl/shared/order/CustomerOrder.java
+1
-1
No files found.
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
a716b031
...
@@ -25,12 +25,7 @@ import com.gogirl.domain.product.serve.BaseProduce;
...
@@ -25,12 +25,7 @@ import com.gogirl.domain.product.serve.BaseProduce;
import
com.gogirl.domain.product.serve.BaseServe
;
import
com.gogirl.domain.product.serve.BaseServe
;
import
com.gogirl.domain.product.serve.BaseType
;
import
com.gogirl.domain.product.serve.BaseType
;
import
com.gogirl.domain.store.store.StoreTechnician
;
import
com.gogirl.domain.store.store.StoreTechnician
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.domain.user.customer.CustomerBalance
;
import
com.gogirl.domain.user.customer.CustomerDetail
;
import
com.gogirl.domain.user.customer.CustomerMessage
;
import
com.gogirl.domain.user.customer.*
;
import
com.gogirl.domain.user.customer.*
;
import
com.gogirl.domain.xcx.GogirlToken
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.common.util.JsonUtilByFsJson
;
import
com.gogirl.infrastructure.common.util.JsonUtilByFsJson
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
...
@@ -733,7 +728,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -733,7 +728,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
List
<
CustomerBalanceRecord
>
customerBalanceRecordList
=
customerBalanceRecordMapper
.
selectList
(
List
<
CustomerBalanceRecord
>
customerBalanceRecordList
=
customerBalanceRecordMapper
.
selectList
(
new
LambdaQueryWrapper
<
CustomerBalanceRecord
>().
eq
(
CustomerBalanceRecord:
:
getCustomerId
,
customerId
)
new
LambdaQueryWrapper
<
CustomerBalanceRecord
>().
eq
(
CustomerBalanceRecord:
:
getCustomerId
,
customerId
)
.
in
(
CustomerBalanceRecord:
:
getType
,
Lists
.
newArrayList
(
1
,
2
))
.
in
(
CustomerBalanceRecord:
:
getType
,
Lists
.
newArrayList
(
1
,
2
))
)
);
//7、聚合结果
//7、聚合结果
CustomerOrder
customerOrder
=
new
CustomerOrder
();
CustomerOrder
customerOrder
=
new
CustomerOrder
();
customerOrder
.
setPageInfo
(
page
);
customerOrder
.
setPageInfo
(
page
);
...
...
src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java
View file @
a716b031
...
@@ -22,12 +22,6 @@ import com.gogirl.infrastructure.common.util.lock.OrderIdLock;
...
@@ -22,12 +22,6 @@ import com.gogirl.infrastructure.common.util.lock.OrderIdLock;
import
com.gogirl.infrastructure.mapper.order.serve.OrderCommentMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderCommentMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderServeDescribeMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderServeDescribeMapper
;
import
com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper
;
import
com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper
;
import
com.gogirl.shared.order.ListOrderQuery
;
import
com.gogirl.shared.order.OrderManageDTO
;
import
com.gogirl.shared.order.OrderPhotoResp
;
import
com.gogirl.shared.order.RecordOrderDataRequest
;
import
com.gogirl.infrastructure.util.SessionUtils
;
import
com.gogirl.infrastructure.util.lock.OrderIdLock
;
import
com.gogirl.shared.order.*
;
import
com.gogirl.shared.order.*
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
...
src/main/java/com/gogirl/shared/order/CustomerOrder.java
View file @
a716b031
...
@@ -33,5 +33,5 @@ public class CustomerOrder {
...
@@ -33,5 +33,5 @@ public class CustomerOrder {
private
Integer
totalChargeTimes
;
private
Integer
totalChargeTimes
;
@ApiModelProperty
(
"累计充值金额"
)
@ApiModelProperty
(
"累计充值金额"
)
private
BigDecimal
totalChargeAmount
private
BigDecimal
totalChargeAmount
;
}
}
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