Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AutogeneralShanghai
yd-backend
Commits
def7e7e8
Commit
def7e7e8
authored
Nov 17, 2020
by
yao.xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充提交
parent
35b2784e
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
9 deletions
+5
-9
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
+1
-2
yd-api/src/main/java/com/yd/api/agms/vo/fortune/FortunePayToOrderRequestVO.java
+0
-1
yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsFortuneMapper.java
+1
-2
yd-api/src/main/java/com/yd/dal/service/agms/AgmsFortuneDALService.java
+1
-1
yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsFortuneDALServiceImpl.java
+2
-2
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
+0
-1
No files found.
yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
View file @
def7e7e8
...
...
@@ -527,10 +527,9 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
@Override
public
FortunePayToOrderResponseVO
fortunePayToOrder
(
FortunePayToOrderRequestVO
requestVO
)
{
FortunePayToOrderResponseVO
responseVO
=
new
FortunePayToOrderResponseVO
();
Long
customerId
=
requestVO
.
getCustomerId
();
Long
payId
=
requestVO
.
getPayId
();
//查询所有订单,并根据支付id标记本次提现订单
List
<
FortunePayToOrderInfo
>
fortunePayToOrderInfos
=
agmsFortuneDalService
.
fortunePayToOrder
(
customerId
,
payId
);
List
<
FortunePayToOrderInfo
>
fortunePayToOrderInfos
=
agmsFortuneDalService
.
fortunePayToOrder
(
payId
);
BigDecimal
totalOrderPrice
=
fortunePayToOrderInfos
.
stream
()
.
map
(
f
->
f
.
getOrderPrice
()
==
null
?
BigDecimal
.
ZERO
:
f
.
getOrderPrice
())
.
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
);
...
...
yd-api/src/main/java/com/yd/api/agms/vo/fortune/FortunePayToOrderRequestVO.java
View file @
def7e7e8
...
...
@@ -7,6 +7,5 @@ import lombok.Data;
*/
@Data
public
class
FortunePayToOrderRequestVO
{
private
Long
customerId
;
private
Long
payId
;
}
yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsFortuneMapper.java
View file @
def7e7e8
...
...
@@ -25,11 +25,10 @@ public interface AgmsFortuneMapper {
/**
* 通过customerId 和 payId 查询 fortune 信息
* @param customerId customerId
* @param payId payId
* @return FortunePayToOrderInfo
*/
List
<
FortunePayToOrderInfo
>
fortunePayToOrder
(
@Param
(
"
customerId"
)
Long
customerId
,
@Param
(
"
payId"
)
Long
payId
);
List
<
FortunePayToOrderInfo
>
fortunePayToOrder
(
@Param
(
"payId"
)
Long
payId
);
/**
* 经纪人支付列表
...
...
yd-api/src/main/java/com/yd/dal/service/agms/AgmsFortuneDALService.java
View file @
def7e7e8
...
...
@@ -30,7 +30,7 @@ public interface AgmsFortuneDALService {
* @param payId payId
* @return FortunePayToOrderInfo
*/
List
<
FortunePayToOrderInfo
>
fortunePayToOrder
(
Long
customerId
,
Long
payId
);
List
<
FortunePayToOrderInfo
>
fortunePayToOrder
(
Long
payId
);
/**
* 支付列表插叙
...
...
yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsFortuneDALServiceImpl.java
View file @
def7e7e8
...
...
@@ -51,8 +51,8 @@ public class AgmsFortuneDALServiceImpl implements AgmsFortuneDALService {
}
@Override
public
List
<
FortunePayToOrderInfo
>
fortunePayToOrder
(
Long
customerId
,
Long
payId
)
{
return
agmsFortuneMapper
.
fortunePayToOrder
(
customerId
,
payId
);
public
List
<
FortunePayToOrderInfo
>
fortunePayToOrder
(
Long
payId
)
{
return
agmsFortuneMapper
.
fortunePayToOrder
(
payId
);
}
@Override
...
...
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
View file @
def7e7e8
...
...
@@ -104,7 +104,6 @@
on o.id = f.order_id
where (o.status = 3 or o.status = 4)
and f.order_price != 0
and f.customer_id = #{customerId,jdbcType=BIGINT}
and f.fortune_payed_id = #{payId,jdbcType=BIGINT}
</select>
...
...
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