提交 b8016b40 authored 作者: zgy's avatar zgy

修改bug

上级 20b4deaa
...@@ -65,9 +65,9 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -65,9 +65,9 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
private String FLUTTERWAVE_REFUND_URL = "https://api.ravepay.co/gpx/merchant/transactions/refund"; private String FLUTTERWAVE_REFUND_URL = "https://api.ravepay.co/gpx/merchant/transactions/refund";
// //校验API // //校验API
private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify"; // private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
//测试API //测试API
// private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify"; private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
/** /**
* 使用卡号支付(预支付) * 使用卡号支付(预支付)
...@@ -80,7 +80,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -80,7 +80,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) { public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) {
RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key"); RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key");
RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key"); RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key");
RaveConstant.ENVIRONMENT = Environment.LIVE; //or live RaveConstant.ENVIRONMENT = Environment.STAGING; //or live
Result result = new Result(); Result result = new Result();
TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId); TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId); TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId);
...@@ -150,12 +150,12 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -150,12 +150,12 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo); TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo);
TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo(); TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
BeanUtils.copyProperties(finance, tbCfFinanceVo); BeanUtils.copyProperties(finance, tbCfFinanceVo);
removeRedisCache(tbCfOrderVo);
} }
result.setData(JSON.parseObject(data)); result.setData(JSON.parseObject(data));
result.setCode(ResultCodeEnum.SUCCESS.getCode()).setMessage("payment success!"); result.setCode(ResultCodeEnum.SUCCESS.getCode()).setMessage("payment success!");
logger.info("payment success!"); logger.info("payment success!");
//清空订单 //清空订单
removeRedisCache(tbCfOrderVo);
} else { } else {
result.setData(JSON.parseObject(data)); result.setData(JSON.parseObject(data));
//支付失败 //支付失败
...@@ -257,7 +257,8 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -257,7 +257,8 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
tbCfOrder.setPayId(payId); tbCfOrder.setPayId(payId);
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue()); tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue()); tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder); int update = tbCfOrderDao.update(tbCfOrder);
System.out.println("update......" + update);
} }
/** /**
......
...@@ -39,12 +39,12 @@ spring: ...@@ -39,12 +39,12 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 测试环境 # 测试环境
url: jdbc:mysql://47.106.242.175:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false # url: jdbc:mysql://47.106.242.175:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
username: root
password: diaoyun666
# url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
# username: root # username: root
# password: Diaoyunnuli.8 # password: diaoyun666
url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
username: root
password: Diaoyunnuli.8
# 连接池配置 # 连接池配置
initial-size: 5 initial-size: 5
......
...@@ -72,12 +72,12 @@ paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC ...@@ -72,12 +72,12 @@ paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC
#flutterwave.encryption.key=38ec6860f49e0d9d488a83b1 #flutterwave.encryption.key=38ec6860f49e0d9d488a83b1
#flutterwave.merchant.id=3950728 #flutterwave.merchant.id=3950728
#################################flutterwave真实(miumiu@afrieshop.com)###################################################### #################################flutterwave真实(miumiu@afrieshop.com)######################################################
flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X #flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X #flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
flutterwave.encryption.key=c06cdc1952600626ec8779ed #flutterwave.encryption.key=c06cdc1952600626ec8779ed
flutterwave.merchant.id=6577084 #flutterwave.merchant.id=6577084
#################################flutterwave测试(TEST)###################################################### #################################flutterwave测试(TEST)######################################################
#flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
#flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
#flutterwave.encryption.key=FLWSECK_TEST001d4c34f798 flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
#flutterwave.merchant.id=1508207 flutterwave.merchant.id=1508207
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论