Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
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
pseer
gxpt_ht
Commits
e067359a
Commit
e067359a
authored
Jan 20, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改取消支付方法
parent
2ec333aa
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
SOrderController.java
...in/java/share/web/controller/system/SOrderController.java
+3
-2
CancelPay.java
...e-system/src/main/java/share/system/domain/CancelPay.java
+5
-0
SOrder.java
share-system/src/main/java/share/system/domain/SOrder.java
+3
-0
No files found.
share-front/src/main/java/share/web/controller/system/SOrderController.java
View file @
e067359a
...
...
@@ -13,6 +13,7 @@ import share.common.core.domain.AjaxResult;
import
share.common.core.domain.R
;
import
share.common.core.redis.RedisUtil
;
import
share.common.utils.JsonConvertUtil
;
import
share.system.domain.CancelPay
;
import
share.system.domain.SConsumer
;
import
share.system.domain.SOrder
;
import
share.system.domain.vo.FrontTokenComponent
;
...
...
@@ -121,8 +122,8 @@ public class SOrderController extends BaseController
*/
@ApiOperation
(
value
=
"取消支付"
)
@RequestMapping
(
value
=
"/cancelPay"
,
method
=
RequestMethod
.
POST
)
public
R
<
Boolean
>
cancelPay
(
@RequestBody
@Validated
@NotBlank
(
message
=
"订单编号不能为空"
)
String
orderNo
)
{
return
R
.
ok
(
sOrderService
.
cancelPay
(
orderNo
));
public
R
<
Boolean
>
cancelPay
(
@RequestBody
@Validated
(
CancelPay
.
class
)
SOrder
sOrder
)
{
return
R
.
ok
(
sOrderService
.
cancelPay
(
sOrder
.
getOrderNo
()
));
}
...
...
share-system/src/main/java/share/system/domain/CancelPay.java
0 → 100644
View file @
e067359a
package
share
.
system
.
domain
;
//取消支付
public
interface
CancelPay
{
}
share-system/src/main/java/share/system/domain/SOrder.java
View file @
e067359a
...
...
@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
org.springframework.validation.annotation.Validated
;
import
share.common.annotation.Excel
;
import
share.common.core.domain.BaseEntity
;
...
...
@@ -24,6 +25,7 @@ import javax.validation.constraints.NotBlank;
* @date 2023-10-09
*/
@Data
@Validated
public
class
SOrder
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -34,6 +36,7 @@ public class SOrder extends BaseEntity
/** 订单流水号 */
@Excel
(
name
=
"订单编号"
)
@NotBlank
(
message
=
"订单编号不能为空"
,
groups
=
{
CancelPay
.
class
})
private
String
orderNo
;
@Excel
(
name
=
"商户订单号"
)
...
...
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