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

Commit 2f08cac3 authored by 胡佳晨's avatar 胡佳晨

增加 pos_crash 支付方式

parent d25ee55b
......@@ -35,6 +35,9 @@ public class GoblinOrderPreParam implements Cloneable{
private String deviceFrom;
private String authCode;
@ApiModelProperty(required = true, value = "支付方式[pos_crash-现金支付|]")
private String payType;
private String openId;
private String returnUrl;
......
......@@ -424,7 +424,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
boolean isFree = false;
GoblinPayInnerResultVo payInnerResultVo;
String payCode;
if (preParam.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0 && !preParam.getPayType().equals("huifu")) {
if (preParam.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0 && !preParam.getPayType().equals("huifu") && !preParam.getPayType().equals("pos_crash")) {
// 调用支付
// if (preParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
// if (preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
......@@ -501,7 +501,15 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
payCode = payInnerResultVo.getCode();
payInnerResultVo.setShowUrl(preParam.getShowUrl());
payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
} else {
}
else if (preParam.getPayType().equals("pos_crash")) {
isFree = true;
preParam.setPayType("POS_CRASH");
payCode = "POS_CRASH_PAY_CODE";
payInnerResultVo = GoblinPayInnerResultVo.getNew();
payInnerResultVo.setPrice(BigDecimal.valueOf(0));
payInnerResultVo.setPayType(preParam.getPayType());
}else {
isFree = true;
preParam.setPayType("FREE");
payCode = "FREE_PAY_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