feat:scene

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

@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.api.merchant.request;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
+import com.jiejing.paycenter.common.enums.pay.PaySceneEnums;
 import com.jiejing.paycenter.common.enums.pay.PayTypeEnums;
 import com.jiejing.paycenter.common.enums.pay.PayTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,6 +45,10 @@ public class StudioMerchantPayRequest {
   @NotNull(message = "支付类型不能为空")
   @NotNull(message = "支付类型不能为空")
   private PayTypeEnums payType;
   private PayTypeEnums payType;
 
 
+  @ApiModelProperty(name = "支付场景", required = true)
+  @NotNull(message = "支付场景不能为空")
+  private PaySceneEnums scene;
+
   @ApiModelProperty(name = "正扫：三方支付账户ID", notes = "微信的openId，支付宝的userId，JS、MINI、NATIVE支付必传")
   @ApiModelProperty(name = "正扫：三方支付账户ID", notes = "微信的openId，支付宝的userId，JS、MINI、NATIVE支付必传")
   private String openId;
   private String openId;
 
 

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

@@ -46,8 +46,8 @@ public class StudioMerchantPayParams {
   @NotNull(message = "支付类型不能为空")
   @NotNull(message = "支付类型不能为空")
   private PayTypeEnums payType;
   private PayTypeEnums payType;
 
 
-  @ApiModelProperty(name = "支付类型", required = true)
-  @NotNull(message = "支付类型不能为空")
+  @ApiModelProperty(name = "支付场景", required = true)
+  @NotNull(message = "支付场景不能为空")
   private PaySceneEnums scene;
   private PaySceneEnums scene;
 
 
   @ApiModelProperty(name = "正扫：三方支付账户ID", notes = "微信的openId，支付宝的userId，JS、MINI、NATIVE支付必传")
   @ApiModelProperty(name = "正扫：三方支付账户ID", notes = "微信的openId，支付宝的userId，JS、MINI、NATIVE支付必传")