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

Commit 556c65fa authored by 张国柄's avatar 张国柄

~购买会员+抖音|银联支付;

parent c3b7035f
...@@ -44,7 +44,7 @@ public class AdamMemberOrderParam implements Serializable { ...@@ -44,7 +44,7 @@ public class AdamMemberOrderParam implements Serializable {
@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;
@ApiModelProperty(position = 20, required = true, value = "支付方式", allowableValues = "alipay,wepay") @ApiModelProperty(position = 20, required = true, value = "支付方式", allowableValues = "alipay,wepay,douyinpay,unionpay")
@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;
......
...@@ -79,7 +79,7 @@ public class LnsRegex { ...@@ -79,7 +79,7 @@ public class LnsRegex {
/** /**
* 支持的支付方式 * 支持的支付方式
*/ */
public static final String TRIPLE_PF_FOR_PAY = "\\b(alipay|wepay)\\b"; public static final String TRIPLE_PF_FOR_PAY = "\\b(alipay|wepay|douyinpay|unionpay)\\b";
/* ======================================================================= | */ /* ======================================================================= | */
......
...@@ -117,6 +117,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -117,6 +117,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
payParam.add("productId", param.getProductId()); payParam.add("productId", param.getProductId());
break; break;
} }
if (param.getPayType().equals("douyinpay")) {
payParam.add("showUrl", param.getShowUrl());
payParam.add("returnUrl", param.getReturnUrl() + orderNo);
}
if (param.getPayType().equals("unionpay")) {
payParam.add("returnUrl", param.getReturnUrl() + orderNo);
}
payParam.add("createDate", nowStr); payParam.add("createDate", nowStr);
payParam.add("expireTime", "5");// 过期时间,单位分钟,默认5 payParam.add("expireTime", "5");// 过期时间,单位分钟,默认5
......
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