Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
Z
zion
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
zion
Commits
d003297b
提交
d003297b
authored
1月 15, 2020
作者:
zgy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改bug
上级
56238603
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
29 行增加
和
43 行删除
+29
-43
FlutterWaveServiceImpl.java
.../zion/chinafrica/service/impl/FlutterWaveServiceImpl.java
+3
-3
TbCfItemDetailDao.xml
src/main/resources/mapper/TbCfItemDetailDao.xml
+18
-32
domain.properties
src/main/resources/properties/domain.properties
+8
-8
没有找到文件。
src/main/java/com/diaoyun/zion/chinafrica/service/impl/FlutterWaveServiceImpl.java
浏览文件 @
d003297b
...
...
@@ -65,9 +65,9 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
private
String
FLUTTERWAVE_REFUND_URL
=
"https://api.ravepay.co/gpx/merchant/transactions/refund"
;
// //校验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
//
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 {
public
Result
payForOrder
(
String
orderId
,
FlutterWaveCard
flutterWaveCard
)
{
RaveConstant
.
PUBLIC_KEY
=
domainProperties
.
getProperty
(
"flutterwave.public.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
();
TbCfOrderVo
tbCfOrderVo
=
(
TbCfOrderVo
)
orderRedisCache
.
get
(
KeyConstant
.
ORDER_DET
+
orderId
);
TbCfOrderEntity
orderEntity
=
tbCfOrderDao
.
queryObject
(
orderId
);
...
...
src/main/resources/mapper/TbCfItemDetailDao.xml
浏览文件 @
d003297b
...
...
@@ -163,40 +163,26 @@
</foreach>
</delete>
<!--获取用户购物车内商品-->
<select
id=
"getCartItemList"
resultType=
"com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo"
>
select
t1.cart_record_id,
t1.check_flag,
t2.item_id,
t2.source_item_id,
t2.station_id,
t2.station_type,
t2.item_title,
t2.item_num,
t2.item_img,
t2.item_price,
t2.item_category,
t2.item_sku,
t2.shop_id,
t2.shop_name,
t2.shop_url,
t2.create_time
from
tb_cf_cart_record_r t1 left join tb_cf_item_detail t2 on t1.item_id=t2.item_id and t1.item_sku=t2.item_sku
where 1=1
and t1.user_id=#{userId}
and t2.item_price is not null
and t1.enable_flag=1 order by t2.create_time desc
<if
test=
"checkFlag != null"
>
and t1.check_flag = #{checkFlag}
</if>
</select>
<!--获取用户购物车内商品-->
<select
id=
"getCartItemList"
resultType=
"com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo"
>
select t1.cart_record_id,t1.check_flag,t2.* from tb_cf_cart_record_r t1,tb_cf_item_detail t2 where
t1.item_id=t2.item_id
and t1.user_id=#{userId} and t2.item_price is not null
<if
test=
"checkFlag != null"
>
and t1.check_flag = #{checkFlag}
</if>
and t1.enable_flag=1 order by t2.create_time desc
</select>
<!--改变购物车的商品勾选状态
-->
<update
id=
"changeItemState"
>
<!--改变购物车的商品勾选状态(旧版)
-->
<update
id=
"changeItemState"
>
update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id=#{cartRecordId}
</update>
<select
id=
"queryItemNum"
resultType=
"int"
>
select count(*) from tb_cf_cart_record_r where 1=1 and user_id=#{userId} and enable_flag=1
</select>
<!--改变购物车商品勾选状态(新版)-->
<update
id=
"changeState"
>
update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id in
<foreach
item=
"id"
collection=
"ids"
open=
"("
separator=
","
close=
")"
>
#{id}
</foreach>
</update>
</mapper>
\ No newline at end of file
src/main/resources/properties/domain.properties
浏览文件 @
d003297b
...
...
@@ -72,12 +72,12 @@ paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC
#flutterwave.encryption.key=38ec6860f49e0d9d488a83b1
#flutterwave.merchant.id=3950728
#################################flutterwave真实(miumiu@afrieshop.com)######################################################
flutterwave.public.key
=
FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
flutterwave.secret.key
=
FLWSECK-c06cdc19526077f3855b76045ca77de3-X
flutterwave.encryption.key
=
c06cdc1952600626ec8779ed
flutterwave.merchant.id
=
6577084
#
flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
#
flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
#
flutterwave.encryption.key=c06cdc1952600626ec8779ed
#
flutterwave.merchant.id=6577084
#################################flutterwave测试(TEST)######################################################
#
flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
#
flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
#
flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
#
flutterwave.merchant.id=1508207
flutterwave.public.key
=
FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
flutterwave.secret.key
=
FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
flutterwave.encryption.key
=
FLWSECK_TEST001d4c34f798
flutterwave.merchant.id
=
1508207
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论