记得上下班打卡 | git大法好,push需谨慎

Commit dd395c05 authored by 姜秀龙's avatar 姜秀龙

docs(api): 补全下单 deviceFrom/payType Swagger 说明

新增 DragonPaySwaggerDoc 统一文案;演出/商品/NFT 入参注解对齐多小程序与 micropay 说明。LnsRegex 支付终端校验补充 appletb 等新 deviceFrom(仅入参校验,支付逻辑不变)。
Co-authored-by: 's avatarCursor <cursoragent@cursor.com>
parent 80190639
...@@ -47,8 +47,10 @@ public class DragonConstant { ...@@ -47,8 +47,10 @@ public class DragonConstant {
} }
public enum DeviceFromEnum{ public enum DeviceFromEnum{
WEB("web",""),WAP("wap",""),WAPPAGE("wappage","") WEB("web","PC网页"),WAP("wap","手机网页"),WAPPAGE("wappage","WAP页")
,APP("app",""),JS("js",""),APPLET("applet",""),APPLETB("appletb",""),APPLET_DOUDOU("appletdoudou",""),APPLET_MOOTOO("appletmootoo",""),APPLET_WENQUE("appletwenque",""),MICROPAY("micropay",""); ,APP("app","App"),JS("js","微信内网页"),APPLET("applet","正在现场小程序"),APPLETB("appletb","摩登小程序")
,APPLET_DOUDOU("appletdoudou","DouDou小程序"),APPLET_MOOTOO("appletmootoo","mootoo小程序")
,APPLET_WENQUE("appletwenque","wenque小程序"),MICROPAY("micropay","付款码/扫码枪");
private String code; private String code;
private String message; private String message;
DeviceFromEnum(String code, String message) { DeviceFromEnum(String code, String message) {
......
package com.liquidnet.service.dragon.doc;
/**
* 支付相关 Swagger 文案(与 {@link com.liquidnet.service.dragon.support.WepayAppletPaySupport} 业务逻辑分离)。
*/
public final class DragonPaySwaggerDoc {
public static final String DEVICE_FROM_VALUE =
"支付终端。微信小程序微信支付:applet=正在现场,appletb=摩登,appletdoudou=DouDou,appletmootoo=mootoo,appletwenque=wenque;"
+ "须配合 payType=wepay 并传当前小程序 openId(sweet maOpenId type 分别为 4/7/8/9/10)。"
+ "其他:app、wap、js、web、wappage;micropay=付款码/扫码枪(payType 传 wepay 或 alipay,须 authCode,非银联)。"
+ "银联云闪付用 payType=unionpay,deviceFrom 一般为 app 或 wap,与 micropay 无关。";
public static final String DEVICE_FROM_ALLOWABLE =
"applet,appletb,appletdoudou,appletmootoo,appletwenque,app,wap,js,web,wappage,micropay";
public static final String PAY_TYPE_VALUE = "支付方式:wepay、alipay、douyinpay、unionpay、applepay 等";
public static final String PAY_TYPE_ALLOWABLE = "wepay,alipay,douyinpay,unionpay,applepay";
public static final String OPEN_ID_VALUE =
"微信 JSAPI/小程序支付必填,须为当前 deviceFrom 对应小程序的 openId";
private DragonPaySwaggerDoc() {
}
}
package com.liquidnet.service.goblin.dto.manage; package com.liquidnet.service.goblin.dto.manage;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -9,7 +10,7 @@ import java.util.ArrayList; ...@@ -9,7 +10,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@ApiModel(value = "GoblinOrderParam") @ApiModel(value = "GoblinOrderParam", description = "POST /goblin/pre 商城下单。微信小程序微信支付见 deviceFrom 与 openId 说明。")
@Data @Data
public class GoblinOrderParam { public class GoblinOrderParam {
...@@ -17,13 +18,13 @@ public class GoblinOrderParam { ...@@ -17,13 +18,13 @@ public class GoblinOrderParam {
private ArrayList<String> addressIds; private ArrayList<String> addressIds;
@ApiModelProperty(value = "代理id") @ApiModelProperty(value = "代理id")
private String agentId; private String agentId;
@ApiModelProperty(value = "支付类型") @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@NotNull(message = "支付类型不能为空") @NotNull(message = "支付类型不能为空")
private String payType; private String payType;
@ApiModelProperty(value = "支付来源 [新增micropay-微信扫码支付]") @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@NotNull(message = "支付来源不能为空") @NotNull(message = "支付来源不能为空")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(value = "openId") @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(value = "showUrl") @ApiModelProperty(value = "showUrl")
private String showUrl; private String showUrl;
......
package com.liquidnet.service.goblin.dto.manage; package com.liquidnet.service.goblin.dto.manage;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -17,13 +18,13 @@ public class MixOrderParam { ...@@ -17,13 +18,13 @@ public class MixOrderParam {
private String mixId; private String mixId;
@ApiModelProperty(value = "入场人地址vo") @ApiModelProperty(value = "入场人地址vo")
private AddressVo addressesVo; private AddressVo addressesVo;
@ApiModelProperty(value = "支付类型") @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@NotNull(message = "支付类型不能为空") @NotNull(message = "支付类型不能为空")
private String payType; private String payType;
@ApiModelProperty(value = "支付来源 [新增micropay-微信扫码支付]") @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@NotNull(message = "支付来源不能为空") @NotNull(message = "支付来源不能为空")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(value = "openId") @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(value = "showUrl") @ApiModelProperty(value = "showUrl")
private String showUrl; private String showUrl;
......
package com.liquidnet.service.goblin.param; package com.liquidnet.service.goblin.param;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -10,18 +11,18 @@ import javax.validation.constraints.NotNull; ...@@ -10,18 +11,18 @@ import javax.validation.constraints.NotNull;
@Data @Data
public class GoblinNftOrderPayAgainParam { public class GoblinNftOrderPayAgainParam {
@ApiModelProperty(value = "openId") @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(value = "订单id") @ApiModelProperty(value = "订单id")
@NotNull(message = "订单ID不能为空") @NotNull(message = "订单ID不能为空")
private String orderId; private String orderId;
@ApiModelProperty(value = "支付类型") @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@NotNull(message = "支付类型不能为空") @NotNull(message = "支付类型不能为空")
private String payType; private String payType;
@ApiModelProperty(value = "支付来源") @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@NotNull(message = "支付来源不能为空") @NotNull(message = "支付来源不能为空")
private String deviceFrom; private String deviceFrom;
......
package com.liquidnet.service.goblin.param; package com.liquidnet.service.goblin.param;
import com.liquidnet.commons.lang.constant.LnsRegex; import com.liquidnet.commons.lang.constant.LnsRegex;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -12,7 +13,7 @@ import javax.validation.constraints.Pattern; ...@@ -12,7 +13,7 @@ import javax.validation.constraints.Pattern;
@Data @Data
public class GoblinNftOrderPayParam { public class GoblinNftOrderPayParam {
@ApiModelProperty(position = 10, value = "openId微信内网页及小程序支付必传") @ApiModelProperty(position = 10, value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(position = 11, required = true, value = "skuId") @ApiModelProperty(position = 11, required = true, value = "skuId")
...@@ -25,12 +26,12 @@ public class GoblinNftOrderPayParam { ...@@ -25,12 +26,12 @@ public class GoblinNftOrderPayParam {
@ApiModelProperty(position = 13, value = "商品券码") @ApiModelProperty(position = 13, value = "商品券码")
private String storeVoucherCode;*/ private String storeVoucherCode;*/
@ApiModelProperty(position = 14, required = true, value = "支付方式", allowableValues = "alipay,wepay,douyinpay,unionpay,applepay") @ApiModelProperty(position = 14, required = true, value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效") @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效")
@NotBlank(message = "支付方式不能为空") @NotBlank(message = "支付方式不能为空")
private String payType; private String payType;
@ApiModelProperty(position = 15, required = true, value = "支付终端", allowableValues = "app,wap,js,applet") @ApiModelProperty(position = 15, required = true, value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效") @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效")
@NotBlank(message = "支付终端不能为空") @NotBlank(message = "支付终端不能为空")
private String deviceFrom; private String deviceFrom;
......
...@@ -4,6 +4,7 @@ import com.liquidnet.service.goblin.dto.manage.GoblinOrderSkuParam; ...@@ -4,6 +4,7 @@ import com.liquidnet.service.goblin.dto.manage.GoblinOrderSkuParam;
import com.liquidnet.service.goblin.entity.GoblinOrderAttr; import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
import com.liquidnet.service.goblin.entity.GoblinOrderSku; import com.liquidnet.service.goblin.entity.GoblinOrderSku;
import com.liquidnet.service.goblin.entity.GoblinStoreOrder; import com.liquidnet.service.goblin.entity.GoblinStoreOrder;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -35,12 +36,13 @@ public class GoblinOrderPreParam implements Cloneable{ ...@@ -35,12 +36,13 @@ public class GoblinOrderPreParam implements Cloneable{
@ApiModelProperty(required = true, value = "订单过期时间") @ApiModelProperty(required = true, value = "订单过期时间")
private int expireTime; private int expireTime;
@ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
private String deviceFrom; private String deviceFrom;
private String authCode; private String authCode;
@ApiModelProperty(required = true, value = "支付方式[pos_crash-现金支付|]") @ApiModelProperty(required = true, value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
private String payType; private String payType;
@ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
private String returnUrl; private String returnUrl;
private String showUrl; private String showUrl;
......
package com.liquidnet.service.goblin.param; package com.liquidnet.service.goblin.param;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -10,13 +11,13 @@ public class PayAgainParam { ...@@ -10,13 +11,13 @@ public class PayAgainParam {
@ApiModelProperty(value = "订单id") @ApiModelProperty(value = "订单id")
@NotNull(message = "订单ID不能为空") @NotNull(message = "订单ID不能为空")
private String orderId; private String orderId;
@ApiModelProperty(value = "支付类型") @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@NotNull(message = "支付类型不能为空") @NotNull(message = "支付类型不能为空")
private String payType; private String payType;
@ApiModelProperty(value = "支付来源") @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@NotNull(message = "支付来源不能为空") @NotNull(message = "支付来源不能为空")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(value = "openId") @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(value = "showUrl") @ApiModelProperty(value = "showUrl")
private String showUrl; private String showUrl;
......
...@@ -17,6 +17,11 @@ ...@@ -17,6 +17,11 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-dragon-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
package com.liquidnet.service.kylin.dto.param; package com.liquidnet.service.kylin.dto.param;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -10,13 +11,13 @@ public class PayAgainParam { ...@@ -10,13 +11,13 @@ public class PayAgainParam {
@ApiModelProperty(value = "订单id") @ApiModelProperty(value = "订单id")
@NotNull(message = "订单ID不能为空") @NotNull(message = "订单ID不能为空")
private String orderId; private String orderId;
@ApiModelProperty(value = "支付类型") @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@NotNull(message = "支付类型不能为空") @NotNull(message = "支付类型不能为空")
private String payType; private String payType;
@ApiModelProperty(value = "支付来源") @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@NotNull(message = "支付来源不能为空") @NotNull(message = "支付来源不能为空")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(value = "openId") @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(value = "showUrl") @ApiModelProperty(value = "showUrl")
private String showUrl; private String showUrl;
......
package com.liquidnet.service.kylin.dto.param; package com.liquidnet.service.kylin.dto.param;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Builder; import lombok.Builder;
...@@ -10,7 +11,7 @@ import javax.validation.constraints.Min; ...@@ -10,7 +11,7 @@ import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@Api @Api(tags = "演出下单", description = "POST /order/pre。微信小程序微信支付见 deviceFrom 与 openId 说明。")
@Data @Data
public class PayOrderParam { public class PayOrderParam {
@ApiModelProperty(value = "演出id") @ApiModelProperty(value = "演出id")
...@@ -40,13 +41,13 @@ public class PayOrderParam { ...@@ -40,13 +41,13 @@ public class PayOrderParam {
@ApiModelProperty(value = "快递类型[0无类型|1寄付|2到付|3包邮]") @ApiModelProperty(value = "快递类型[0无类型|1寄付|2到付|3包邮]")
@NotNull(message = "快递方式不能为空") @NotNull(message = "快递方式不能为空")
private Integer expressType; private Integer expressType;
@ApiModelProperty(value = "支付类型") @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
@NotNull(message = "支付类型不能为空") @NotNull(message = "支付类型不能为空")
private String payType; private String payType;
@ApiModelProperty(value = "支付来源") @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
@NotNull(message = "支付来源不能为空") @NotNull(message = "支付来源不能为空")
private String deviceFrom; private String deviceFrom;
@ApiModelProperty(value = "openId") @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
private String openId; private String openId;
@ApiModelProperty(value = "showUrl") @ApiModelProperty(value = "showUrl")
private String showUrl; private String showUrl;
......
...@@ -123,7 +123,8 @@ public class LnsRegex { ...@@ -123,7 +123,8 @@ public class LnsRegex {
/** /**
* 支持的支付终端 * 支持的支付终端
*/ */
public static final String TRIPLE_PF_FOR_PAY_TERMINAL = "\\b(app|wap|js|applet)\\b"; public static final String TRIPLE_PF_FOR_PAY_TERMINAL =
"\\b(app|wap|js|applet|appletb|appletdoudou|appletmootoo|appletwenque|web|wappage|micropay)\\b";
/** /**
* 支持的支付方式 * 支持的支付方式
*/ */
......
...@@ -5,6 +5,7 @@ import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto; ...@@ -5,6 +5,7 @@ import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto; import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto; import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
import com.liquidnet.service.dragon.service.IDragonOrdersService; import com.liquidnet.service.dragon.service.IDragonOrdersService;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import com.liquidnet.service.dragon.support.WepayAppletPaySupport; import com.liquidnet.service.dragon.support.WepayAppletPaySupport;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -44,8 +45,8 @@ public class PayController { ...@@ -44,8 +45,8 @@ public class PayController {
@ApiOperation("Dragon支付") @ApiOperation("Dragon支付")
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,unionpay,applepay", example = "unionpay"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple,micropay", example = "wap"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "业务类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "业务类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.1"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "订单名称", example = "测试订单001"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "订单名称", example = "测试订单001"),
......
...@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.StringUtil; ...@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto; import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto; import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import com.liquidnet.service.dragon.service.IDragonOrdersService; import com.liquidnet.service.dragon.service.IDragonOrdersService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -52,7 +53,7 @@ public class PayNotifyController { ...@@ -52,7 +53,7 @@ public class PayNotifyController {
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,unionpay,applepay", example = "unionpay"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,unionpay,applepay", example = "unionpay"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple,micropay,inner", example = "wap"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "业务类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "业务类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.1"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "订单名称", example = "测试订单001"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "订单名称", example = "测试订单001"),
......
...@@ -9,6 +9,7 @@ import com.liquidnet.service.goblin.param.GoblinNftOrderPayAgainParam; ...@@ -9,6 +9,7 @@ import com.liquidnet.service.goblin.param.GoblinNftOrderPayAgainParam;
import com.liquidnet.service.goblin.param.GoblinNftOrderPayCallbackParam; import com.liquidnet.service.goblin.param.GoblinNftOrderPayCallbackParam;
import com.liquidnet.service.goblin.param.GoblinNftOrderPayParam; import com.liquidnet.service.goblin.param.GoblinNftOrderPayParam;
import com.liquidnet.service.goblin.param.GoblinNftOrderRefundCallbackParam; import com.liquidnet.service.goblin.param.GoblinNftOrderRefundCallbackParam;
import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
import com.liquidnet.service.goblin.service.IGoblinNftOrderService; import com.liquidnet.service.goblin.service.IGoblinNftOrderService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -87,7 +88,7 @@ public class GoblinNftOrderController { ...@@ -87,7 +88,7 @@ public class GoblinNftOrderController {
@ApiOperation("兑换") @ApiOperation("兑换")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "from", required = true, dataType = "String", name = "code", value = "兑换码", example = "1"), @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "code", value = "兑换码", example = "1"),
@ApiImplicitParam(type = "from", required = true, dataType = "String", name = "deviceFrom", value = "支付终端", example = "app", allowableValues = "app,wap,js,applet"), @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "deviceFrom", value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, example = "applet", allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE),
}) })
public ResponseDto<Boolean> exchange( public ResponseDto<Boolean> exchange(
@RequestParam("code") @NotBlank(message = "兑换码不能为空") String code, @RequestParam("code") @NotBlank(message = "兑换码不能为空") String code,
......
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