Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
order-group-application
order-group
Commits
c39d8256
Commit
c39d8256
authored
Dec 29, 2020
by
梁崇福
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "富友"
This reverts commit
4709b0bd
parent
4709b0bd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
49 deletions
+0
-49
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+0
-11
order-application-service/src/main/java/cn/freemud/entities/vo/PlatformPaySuccessRequest.java
+0
-15
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
+0
-4
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-19
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
c39d8256
...
@@ -383,15 +383,4 @@ public class OrderController {
...
@@ -383,15 +383,4 @@ public class OrderController {
return
orderservice
.
queryOrderRider
(
requestVo
);
return
orderservice
.
queryOrderRider
(
requestVo
);
}
}
/**
* 用户开放平台,订单支付完成回调
* @param requestVo
* @return
*/
@ApiAnnotation
(
logMessage
=
"platform/paysuccess"
)
@PostMapping
(
"/platform/paysuccess"
)
public
BaseResponse
platformPaysuccess
(
@Validated
@LogParams
@RequestBody
PlatformPaySuccessRequest
requestVo
){
return
orderservice
.
platformPaysuccess
(
requestVo
);
}
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/PlatformPaySuccessRequest.java
deleted
100644 → 0
View file @
4709b0bd
package
cn
.
freemud
.
entities
.
vo
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.NotEmpty
;
@Data
public
class
PlatformPaySuccessRequest
{
@NotEmpty
(
message
=
"orderCode 不能为空"
)
private
String
orderCode
;
@NotEmpty
(
message
=
"商户号 不能为空"
)
private
String
partnerId
;
}
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
View file @
c39d8256
...
@@ -144,8 +144,4 @@ public interface Orderservice {
...
@@ -144,8 +144,4 @@ public interface Orderservice {
BaseResponse
queryCollageOrderById
(
Integer
operation
,
String
sessionId
,
String
oid
,
String
partnerId
,
String
channel
);
BaseResponse
queryCollageOrderById
(
Integer
operation
,
String
sessionId
,
String
oid
,
String
partnerId
,
String
channel
);
BaseResponse
queryOrderRider
(
OrderRiderRequestVo
requestVo
);
BaseResponse
queryOrderRider
(
OrderRiderRequestVo
requestVo
);
BaseResponse
platformPaysuccess
(
PlatformPaySuccessRequest
requestVo
);
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
c39d8256
...
@@ -1244,25 +1244,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1244,25 +1244,6 @@ public class OrderServiceImpl implements Orderservice {
return
ResponseUtil
.
success
(
responseVo
);
return
ResponseUtil
.
success
(
responseVo
);
}
}
@Override
public
BaseResponse
platformPaysuccess
(
PlatformPaySuccessRequest
requestVo
)
{
BaseQueryOrderRequest
baseQueryOrderRequest
=
new
BaseQueryOrderRequest
();
baseQueryOrderRequest
.
setOrderId
(
requestVo
.
getOrderCode
());
baseQueryOrderRequest
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
QueryOrderByIdResponse
queryOrderByIdResponse
=
orderCenterSdkService
.
queryOrderById
(
baseQueryOrderRequest
);
if
(!
RESPONSE_SUCCESS_CODE
.
equals
(
queryOrderByIdResponse
.
getErrcode
())
||
queryOrderByIdResponse
.
getData
()
==
null
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_QUERYORDER_ERROR
);
}
// 扣减储值卡
// 扣减券
// 扣减积分
return
ResponseUtil
.
success
();
}
private
String
getRedpacketsPicture
(
String
activityId
)
{
private
String
getRedpacketsPicture
(
String
activityId
)
{
if
(
StringUtils
.
isNotBlank
(
activityId
))
{
if
(
StringUtils
.
isNotBlank
(
activityId
))
{
try
{
try
{
...
...
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