Skip to content

F
fit-finance
Commit 8f007cd4 by 程裕兵
Options

feat:pay

parent 7d03fc8a
Showing with 5 additions and 8 deletions
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/StudioMerchantPayRequest.java
...@@ -35,8 +35,7 @@ public class StudioMerchantPayRequest { ...@@ -35,8 +35,7 @@ public class StudioMerchantPayRequest {
@NotNull(message = "支付总金额不能为空") @NotNull(message = "支付总金额不能为空")
private BigDecimal transAmount; private BigDecimal transAmount;
@ApiModelProperty(name = "业务订单号", required = true) @ApiModelProperty(name = "业务订单号")
@NotBlank(message = "业务订单号不能为空")
private String orderNo; private String orderNo;
@ApiModelProperty(name = "业务子订单号") @ApiModelProperty(name = "业务子订单号")
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
...@@ -78,8 +78,8 @@ public class PayConvert { ...@@ -78,8 +78,8 @@ public class PayConvert {
return StudioCashierRecord.builder() return StudioCashierRecord.builder()
.id(id) .id(id)
.transNo(id.toString()) .transNo(id.toString())
.orderNo(params.getOrderNo()) .orderNo(StringUtil.isBlank(params.getOrderNo()) ? "" : params.getOrderNo())
.subOrderNo(params.getSubOrderNo()) .subOrderNo(StringUtil.isBlank(params.getSubOrderNo()) ? "" : params.getSubOrderNo())
.orderType(params.getOrderType().getCode()) .orderType(params.getOrderType().getCode())
.transType(BrandCashierTransTypeEnum.PAY.getCode()) .transType(BrandCashierTransTypeEnum.PAY.getCode())
.brandId(studio.getBrandId()) .brandId(studio.getBrandId())
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/params/StudioMerchantPayParams.java
...@@ -35,12 +35,10 @@ public class StudioMerchantPayParams { ...@@ -35,12 +35,10 @@ public class StudioMerchantPayParams {
@NotNull(message = "支付总金额不能为空") @NotNull(message = "支付总金额不能为空")
private BigDecimal transAmount; private BigDecimal transAmount;
@ApiModelProperty(name = "业务订单号", required = true) @ApiModelProperty(name = "业务订单号")
@NotBlank(message = "业务订单号不能为空")
private String orderNo; private String orderNo;
@ApiModelProperty(name = "业务子订单号", required = true) @ApiModelProperty(name = "业务子订单号")
@NotBlank(message = "业务子订单号不能为空")
private String subOrderNo; private String subOrderNo;
@ApiModelProperty(name = "业务订单类型", required = true) @ApiModelProperty(name = "业务订单类型", required = true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment