Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
wangyingyang
2024-11-29 11:19:29 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f24bbddadacfe20c50f5f836a725246b83bad9dd
f24bbdda
1 parent
3d0eb933
fix
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
5 deletions
.DS_Store
src/main/java/com/infoloop/tianting/model/dto/PayDTO.java
src/main/java/com/infoloop/tianting/service/client/PayServiceClient.java
src/main/java/com/infoloop/tianting/service/impl/KdsServiceImpl.java
.DS_Store
View file @
f24bbdd
No preview for this file type
src/main/java/com/infoloop/tianting/model/dto/PayDTO.java
View file @
f24bbdd
...
...
@@ -24,6 +24,7 @@ public class PayDTO {
private
String
openId
;
private
String
hospitalCode
;
private
String
price
;
private
String
phone
;
}
@Data
...
...
@@ -65,6 +66,17 @@ public class PayDTO {
@Data
@Builder
@ApiModel
(
description
=
"支付状态修改dto"
)
@NoArgsConstructor
@AllArgsConstructor
public
static
class
PayStatusUpdateRequestDto
{
private
Boolean
success
;
private
String
error
;
private
PayResult
result
;
}
@Data
@Builder
@ApiModel
(
description
=
"第三方支付平台通知请求dto"
)
@NoArgsConstructor
@AllArgsConstructor
...
...
src/main/java/com/infoloop/tianting/service/client/PayServiceClient.java
View file @
f24bbdd
...
...
@@ -36,10 +36,10 @@ public class PayServiceClient {
jsonData
.
setTradeId
(
payRequestDto
.
getOrderId
());
String
requestDate
=
DateUtil
.
formatDate
(
LocalDateTime
.
now
(),
DateUtil
.
YMDHMS
);
jsonData
.
setRequestDate
(
requestDate
);
jsonData
.
setRequestSource
(
""
);
jsonData
.
setRequestSource
(
"
OFWXApplet
"
);
jsonData
.
setPayerOpenId
(
payRequestDto
.
getOpenId
());
jsonData
.
setHospitalCode
(
payRequestDto
.
getHospitalCode
());
jsonData
.
setPID
(
""
);
jsonData
.
setPID
(
payRequestDto
.
getPhone
()
);
jsonData
.
setRemark
(
""
);
jsonData
.
setTransAmount
(
payRequestDto
.
getPrice
());
jsonData
.
setTradeDesc
(
""
);
...
...
src/main/java/com/infoloop/tianting/service/impl/KdsServiceImpl.java
View file @
f24bbdd
...
...
@@ -199,16 +199,21 @@ public class KdsServiceImpl implements KdsService {
List
<
KdsMealDetailDto
>
kdsMealDetailDtoList
=
new
ArrayList
<>();
for
(
Integer
mealId:
mealIds
)
{
final
var
meal
=
allMeals
.
stream
().
filter
(
m
->
m
.
getId
()
==
mealId
).
findFirst
();
if
(
meal
.
isEmpty
())
{
String
mealName
=
""
;
if
(
meal
.
isEmpty
()
&&
mealId
!=
0
)
{
continue
;
}
if
(
meal
.
isPresent
())
{
mealName
=
meal
.
get
().
getName
();
}
final
var
totalCount
=
orderDetailList
.
stream
()
.
filter
(
od
->
od
.
getMealId
()
==
mealId
)
.
mapToInt
(
SingleClientCustomerOrderDetailRpcResponse:
:
getCount
)
.
sum
();
final
var
mealDetail
=
KdsMealDetailDto
.
builder
()
.
mealId
(
meal
.
get
().
getId
()
)
.
mealName
(
meal
.
get
().
getName
()
)
.
mealId
(
meal
Id
)
.
mealName
(
meal
Name
)
.
totalCount
(
totalCount
)
.
build
();
kdsMealDetailDtoList
.
add
(
mealDetail
);
...
...
Please
register
or
login
to post a comment