yixian
|
04c052b75f
|
build: 2.1.7
|
5 years ago |
luoyang
|
4e339e750d
|
fastjson 2.1.6
|
5 years ago |
|
luoyang
|
191d676ddb
|
fastjson 1.2.62->1.2.68
|
5 years ago |
|
luoyang
|
6231b2a6bf
|
update 2.1.2
|
5 years ago |
|
yixian
|
efccef2df8
|
build: 2.1.3
|
5 years ago |
|
yixian
|
dd5f00ec69
|
build: 2.1.2 rpaysvc
|
5 years ago |
|
yixian
|
856eecac74
|
Merge branch 'develop-2.0' into develop
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java
# src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
# src/main/resources/application-dev.properties
# src/main/resources/application-local.properties
# src/main/resources/application.properties
|
5 years ago |
|
luoyang
|
372a4346bb
|
add rservice app notify
|
5 years ago |
|
luoyang
|
f85aec853c
|
add 更新最新合同模版
|
5 years ago |
|
luoyang
|
f0ca9373d2
|
fix incremental rate display
|
5 years ago |
|
luoyang
|
aef3a80bba
|
add 推送通知test
|
5 years ago |
|
luoyang
|
e32ff20b40
|
add 增值服务交易流水
|
5 years ago |
dulingling
|
917eadf0f1
|
Upd:修复部分商户下载文件无法查看订单备注问题
|
5 years ago |
|
dulingling
|
d8655ef3e6
|
Upd:商户的ext_params在商户支付配置中做面板/
enable_presettle 在清算设置中添加选项
|
5 years ago |
|
dulingling
|
6da96d24d7
|
Upd:商户的ext_params在商户支付配置中做面板/
enable_presettle 在清算设置中添加选项
|
5 years ago |
|
luoyang
|
866153a943
|
fix merge settle total surcharge
|
5 years ago |
|
luoyang
|
eaaefc6334
|
fix pom.xml
|
5 years ago |
|
luoyang
|
08328d4370
|
add ap清算文件 报表增加商户编码和简称
|
5 years ago |
|
luoyang
|
529be0e353
|
fix 清算日报时间误差
|
5 years ago |
|
luoyang
|
d871253368
|
add 支持合并清算报表下载查看、退款增加弹窗
|
5 years ago |
|
luoyang
|
1a3fa95ddd
|
add 手动清算增加统计功能
|
5 years ago |
|
luoyang
|
c3e81c06e7
|
优化gateway 上传文件报错
|
5 years ago |
|
luoyang
|
d2e61ea9df
|
add 商户欠款列表分类
|
5 years ago |
|
luoyang
|
3f613fd797
|
fix 商户类别交易趋势统计 旅游出行
|
5 years ago |
|
luoyang
|
dbdbdc91bf
|
fix 优化商户新增增值服务
|
5 years ago |
|
luoyang
|
bc4f598a36
|
fix 优化商户新增增值服务
|
5 years ago |
|
luoyang
|
c65b6a257d
|
fix 优化商户新增增值服务，增加新增付费debit
|
5 years ago |
|
luoyang
|
698ec55577
|
fix echarts partner为false加1情况
|
5 years ago |
|
luoyang
|
57e46bc170
|
add 商户类别交易趋势增加交易商户数数据
|
5 years ago |
|
luoyang
|
a3b43675af
|
add 商户类别交易趋势增加百分比
|
5 years ago |
|
luoyang
|
cb83e25620
|
fix pom
|
5 years ago |
|
luoyang
|
d160dd54f5
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
a1465a7a3b
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
2507d4b332
|
add 合规跳转商户端
|
5 years ago |
|
luoyang
|
c403863648
|
add RP商户类别交易统计
|
5 years ago |
|
luoyang
|
fd0b6c3e1d
|
fix gwt2 partner error
|
5 years ago |
|
luoyang
|
c981e127d2
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
8a45a4fffc
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
4522cce652
|
fix partners industry改为royalpay行业
|
5 years ago |
|
luoyang
|
a4111e1fd4
|
fix 开通邮件、子商户chose改为more
|
5 years ago |
|
dulingling
|
a827171295
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
42946ee7af
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
yixian
|
14a7d49c81
|
build: 2.0.0 integration
|
5 years ago |
|
luoyang
|
3d17c1fc82
|
fix parnters
|
5 years ago |
|
luoyang
|
3a8466c83b
|
同步develop master代码
|
5 years ago |
|
luoyang
|
6efe8ce301
|
add 商户自定义配置 hide_mch_device 隐藏设备
|
5 years ago |
|
luoyang
|
674ae4b1f8
|
fix 增加测试账号leoh
|
5 years ago |
|
luoyang
|
f864b7c695
|
add level3_mch_config 自动配置
|
5 years ago |
|
luoyang
|
04d44f8bef
|
add ka商户子商户检索支持
|
5 years ago |
|
dulingling
|
2b921b92c3
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
b19d14ab7a
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
482bb9721d
|
Upd:修改计算新老消费者人头数，每日数据生成逻辑
|
5 years ago |
|
luoyang
|
5fb3e409da
|
add shortname rsvc
|
5 years ago |
|
luoyang
|
1e28b924ec
|
fix 跨境商城app 测试
|
5 years ago |
|
luoyang
|
381e26453c
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
8bec790b96
|
add rsvc返回CompanyName
|
5 years ago |
|
luoyang
|
1837cf3e80
|
add rsvc增加abn\acn字段
|
5 years ago |
|
luoyang
|
497303cbfe
|
fix gateway merchant transaction fee
|
5 years ago |
|
luoyang
|
1df4b4b0a9
|
fix 优化商户增加营销联系人
|
5 years ago |
|
luoyang
|
3f123eee41
|
add App 弹窗黑名单功能
|
5 years ago |
|
luoyang
|
7575fb56b9
|
delete app not found test
|
5 years ago |
liuxinxin
|
f1b2c2f453
|
【R】 商户详情新增对接人信息
|
5 years ago |
|
luoyang
|
e4a0a4ebfa
|
fix app boolean int
|
5 years ago |
|
luoyang
|
85e0ae4a50
|
fix app boolean int
|
5 years ago |
|
luoyang
|
370ea700ea
|
fix app boolean int
|
5 years ago |
|
luoyang
|
1088e2bbdc
|
fix app 弹窗次数
|
5 years ago |
|
luoyang
|
90aeded68c
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
3cc9623569
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
e32493f654
|
add 跨境商城RP付费扣款 增加扣款订单
|
5 years ago |
|
luoyang
|
ccfabff97d
|
add popup增加显示次数控制
|
5 years ago |
|
luoyang
|
140fe334ee
|
fix geek act
|
5 years ago |
|
liuxinxin
|
c1e46d9e4d
|
【R】商户Invoice接口
|
5 years ago |
|
luoyang
|
74d0ca7365
|
fix pom.xml
|
5 years ago |
|
luoyang
|
e26490808b
|
fix 模糊查询
|
5 years ago |
|
luoyang
|
72ff8eb390
|
add 弹窗+banner增加版本检测、商户端增加商户订单id、平台订单模糊查询、交易流水增加search框
|
5 years ago |
|
luoyang
|
e69c031067
|
fix 活动页新增枚举popup
|
5 years ago |
|
luoyang
|
42e03548dd
|
fix 活动页新增枚举popup
|
5 years ago |
|
luoyang
|
f4201385da
|
fix 跨境商城使用详情页面
|
5 years ago |
|
luoyang
|
c735bc500f
|
fix 跨境商城使用详情页面
|
5 years ago |
|
luoyang
|
963dbc7040
|
add 开店状态通知、app扫码接口增加source参数
|
5 years ago |
|
luoyang
|
20200198c8
|
add app弹窗运营修改
|
5 years ago |
|
luoyang
|
a31f127c26
|
add App扫码同时单点登录跨境商城
|
5 years ago |
|
luoyang
|
ff5a3cbc46
|
fix 商服弹窗只针对pine开放
|
5 years ago |
|
luoyang
|
fb436d375a
|
fix transflow pdf clientIds
|
5 years ago |
|
luoyang
|
0c7afb545c
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
b53dbf98dc
|
add 单点登录、app通用弹窗接口
|
5 years ago |
|
dulingling
|
bbfcf099a1
|
Upd:升级版本
|
5 years ago |
|
luoyang
|
2d8fdaece4
|
fix maven cache
|
5 years ago |
|
luoyang
|
3342b331e5
|
fix rServer listen
|
5 years ago |
|
luoyang
|
4fabe349cd
|
fix summary下载20条问题
|
5 years ago |
|
luoyang
|
4bb094afa0
|
fix summary下载20条问题
|
5 years ago |
|
luoyang
|
6b567ea463
|
fix pom.xml
|
5 years ago |
|
luoyang
|
0b0161f7a3
|
fix 进件api删除多余行业，增加RsvcServer接口
|
5 years ago |
taylor.dang
|
68c4af820b
|
[Y] 商户新增禁止显示子商户选项开关
|
5 years ago |
|
luoyang
|
d12af68c4a
|
fix gateway error message
|
5 years ago |
|
luoyang
|
cdc151b7ee
|
add 子商户分页
|
5 years ago |
|
luoyang
|
1f607ffa4b
|
fix url pom.xml
|
5 years ago |
|
luoyang
|
33723c228c
|
fix controller org
|
5 years ago |
|
luoyang
|
ac20d64c6a
|
fix dev controller class
|
5 years ago |
|
luoyang
|
44e44af0bb
|
add gateway 商户进件相关功能
|
5 years ago |
