feat:pay

api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/StudioMerchantPayRequest.java

@@ -35,8 +35,7 @@ public class StudioMerchantPayRequest {
   @NotNull(message = "支付总金额不能为空")
   private BigDecimal transAmount;
 
-  @ApiModelProperty(name = "业务订单号", required = true)
-  @NotBlank(message = "业务订单号不能为空")
+  @ApiModelProperty(name = "业务订单号")
   private String orderNo;
 
   @ApiModelProperty(name = "业务子订单号")

service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java

@@ -78,8 +78,8 @@ public class PayConvert {
     return StudioCashierRecord.builder()
         .id(id)
         .transNo(id.toString())
-        .orderNo(params.getOrderNo())
-        .subOrderNo(params.getSubOrderNo())
+        .orderNo(StringUtil.isBlank(params.getOrderNo()) ? "" : params.getOrderNo())
+        .subOrderNo(StringUtil.isBlank(params.getSubOrderNo()) ? "" : params.getSubOrderNo())
         .orderType(params.getOrderType().getCode())
         .transType(BrandCashierTransTypeEnum.PAY.getCode())
         .brandId(studio.getBrandId())

service/src/main/java/com/jiejing/fitness/finance/service/pay/params/StudioMerchantPayParams.java

@@ -35,12 +35,10 @@ public class StudioMerchantPayParams {
   @NotNull(message = "支付总金额不能为空")
   private BigDecimal transAmount;
 
-  @ApiModelProperty(name = "业务订单号", required = true)
-  @NotBlank(message = "业务订单号不能为空")
+  @ApiModelProperty(name = "业务订单号")
   private String orderNo;
 
-  @ApiModelProperty(name = "业务子订单号", required = true)
-  @NotBlank(message = "业务子订单号不能为空")
+  @ApiModelProperty(name = "业务子订单号")
   private String subOrderNo;
 
   @ApiModelProperty(name = "业务订单类型", required = true)