dulingling
|
79425c194f
|
Upd:新版账单码
|
5 years ago |
yixian
|
ca8fbaa633
|
module update
|
5 years ago |
yixian
|
f260b5e95b
|
documents
|
5 years ago |
yixian
|
10f413399d
|
upgrade 2.1.22
|
5 years ago |
yixian
|
1b97c79ca3
|
build: 2.1.21
|
5 years ago |
yixian
|
4b86bdebe0
|
json issue
|
5 years ago |
yixian
|
6207aabe33
|
module upgrade
|
5 years ago |
luoyang
|
45645f4b21
|
add partner invoice
|
5 years ago |
luoyang
|
80fe7bf08c
|
fix 开启跨境商城app推送
|
5 years ago |
yixian
|
c32e555e5e
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
yixian
|
16debe6c9f
|
module upgrade to 2.1.13
|
5 years ago |
luoyang
|
2867b8e746
|
add 增值服务财务报表
|
5 years ago |
yixian
|
7f2ce325da
|
update cardpay ui
|
5 years ago |
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 |
luoyang
|
246ef08ab8
|
1.3.24 增加surcharge_rate 字段,后续未调整
|
5 years ago |
taylor.dang
|
0582321556
|
[Y] 新增禁止查询level3商户开关
|
5 years ago |
dulingling
|
073df7b0ee
|
Upd:客户订单交易数据修改为无交易也显示日期
|
5 years ago |
liuxinxin
|
d8d371dbc1
|
[R] fix
|
5 years ago |
liuxinxin
|
947609278d
|
[R] 开发工具 查询报关情况
|
5 years ago |
luoyang
|
2d47d888b3
|
fix order source
|
5 years ago |
luoyang
|
1fe36f7429
|
fix order source
|
5 years ago |
luoyang
|
ee1e41f66b
|
add kyc update
|
5 years ago |
luoyang
|
9da043de5c
|
add 清算表格增加dev remark
|
5 years ago |
liuxinxin
|
bc49f7667d
|
[R] fix
|
5 years ago |
liuxinxin
|
5d277bf0b9
|
[R] APP端接口调整
|
5 years ago |
dulingling
|
0404b35b1f
|
Add:添加支付宝支付页面
|
5 years ago |
liuxinxin
|
b22ecb893e
|
[R] pom
|
5 years ago |
liuxinxin
|
b35e33fc0a
|
[R] APP端接口调整
|
5 years ago |
luoyang
|
fa7e289d51
|
fix wx notify
|
5 years ago |
duLingLing
|
c71b44eef4
|
Add:新增微信支付页面
|
5 years ago |
luoyang
|
39c08c4394
|
fix pom.xml
|
5 years ago |
luoyang
|
81ef18360a
|
fix rservice apply
|
5 years ago |
luoyang
|
2691047d15
|
add 合规审核R-services扣款申请,接收来自Rservices的扣款申请推送
|
5 years ago |
duLingLing
|
f906f0d9c8
|
Upd:修复提供接口错误字段
|
5 years ago |
taylor.dang
|
eea73c3b20
|
[Y] R service新增参数 & 修改清算文件
|
5 years ago |
duLingLing
|
bcafcdcb29
|
Upd:服务提供spms读取数据结构查询条件
|
5 years ago |
duLingLing
|
e12419d3b8
|
升级版本
|
5 years ago |
taylor.dang
|
e173e25dcf
|
[Y] R service 加密参数格式
|
5 years ago |
taylor.dang
|
9ac244038a
|
[Y] R service 加密参数
|
5 years ago |
duLingLing
|
06c3bc7496
|
升级版本
|
5 years ago |
duLingLing
|
627c922ec3
|
升级核心包
|
5 years ago |
duLingLing
|
bf4085b07c
|
Upd:App登录退出补偿
|
5 years ago |
duLingLing
|
ca6b6dbe24
|
Upd:修復交易排名數據五刷新
|
5 years ago |
duLingLing
|
c3b505e8f9
|
Upd:修改RService无图片替换图片
|
5 years ago |
luoyang
|
169365e03f
|
fix pom.xml
|
5 years ago |
duLingLing
|
377dd3a489
|
升级版本
|
5 years ago |
luoyang
|
da10968f48
|
fix pom.xml
|
5 years ago |
luoyang
|
f5d17b5083
|
fix pom.xml
|
5 years ago |
luoyang
|
fcbaeae808
|
add R services
|
5 years ago |
luoyang
|
36c6d99d84
|
Merge branch 'devlop-T1125-R-Rervice' into develop
|
5 years ago |
duLingLing
|
f72ab6e8d5
|
Upd:交易流水查看timezone空指针异常处理
|
5 years ago |
duLingLing
|
63f12caff6
|
Upd:商户端WEB,APP查询数据异常
|
5 years ago |
duLingLing
|
a8f659549c
|
Upd:交易流水查看条件-日期无进行时区转换问题
|
5 years ago |
duLingLing
|
f7c049a2d6
|
Upd:App查看交易流水汇总异常处理
|
5 years ago |
duLingLing
|
3b8cfdbea5
|
Merge branch 'develop_T1140' of https://pms.globalfreepay.com/source/royalpay.manage into devlop-T1125-R-Rervice
|
5 years ago |
duLingLing
|
efc63cc373
|
R-service
|
5 years ago |
luoyang
|
d6074bc055
|
fix source_agree_file 排序问题
|
5 years ago |
luoyang
|
623ec31c91
|
add 订单来源 source支持
|
5 years ago |
duLingLing
|
f4834125cc
|
Upd:添加Gateway子分类
|
5 years ago |
luoyang
|
3a50fc9dee
|
fix 客户支付手续费导致提成组织成本手续费高
|
5 years ago |
duLingLing
|
d40b65ba6f
|
Upd:登录识别字段由OpenId变更为unionId,微信不同平台相同识别字段为unionid
|
5 years ago |
liuxinxin
|
87324141db
|
【R】自定义费率fix
|
5 years ago |
duLingLing
|
7f871d1aa4
|
Upd:添加新闻增加标题字段,该字段只针对news创建使用
|
5 years ago |
duLingLing
|
214195b24d
|
UPD:修复商户-用户账号绑定异常问题
|
5 years ago |
duLingLing
|
f31d50c1e6
|
UPD:修复商户-用户账号绑定异常问题
|
5 years ago |
duLingLing
|
5ba4873bfa
|
Upd:修复管理端微信绑定查询已绑定用户报错问题
|
5 years ago |
luoyang
|
2212a02829
|
fix 商户手机号 size>0
|
5 years ago |
luoyang
|
d3cb52c869
|
fix pom.xml
|
5 years ago |
luoyang
|
794e637559
|
fix customer_surcharge_rate 未通过也可以设置
|
5 years ago |
luoyang
|
e3211c89fa
|
fix findAccountByPhone
|
5 years ago |
luoyang
|
3363146993
|
fix findAccountByPhone查到多条记录
|
5 years ago |
luoyang
|
bdba35af67
|
fix 恢复注释
|
5 years ago |
duLingLing
|
1a304a9fd5
|
UPD:修改微信确定绑定,优先校验用户名密码
|
5 years ago |
duLingLing
|
b7e4a0043b
|
升級版本
|
5 years ago |
duLingLing
|
ac6f9877e1
|
刪除ip限定
|
5 years ago |
luoyang
|
0db2b3a576
|
add 自助进件调整
|
5 years ago |
duLingLing
|
4fd9de60e8
|
个人设置新增接收解绑发送验证码接口
|
5 years ago |
duLingLing
|
5a1dec2a47
|
个人设置新增接收解绑发送验证码接口
|
5 years ago |
duLingLing
|
5315d8ddbc
|
Upd:修改个人设置短信验证码发送接口
|
5 years ago |
duLingLing
|
13df0df1c1
|
Upd:修改错误名称
|
5 years ago |
luoyang
|
6260572efc
|
fix 微信子商户号申请
|
5 years ago |
luoyang
|
09a9488055
|
fix pom
|
5 years ago |
luoyang
|
231e19ea2f
|
fix pom
|
5 years ago |
duLingLing
|
bce2dae124
|
TradeLogs 添加商户数统计修改显示图标
|
5 years ago |
duLingLing
|
7501bbbd2c
|
TradeLogs 添加商户数统计修改显示图标
|
5 years ago |
duLingLing
|
5c7d632ffb
|
TradeLogs 添加商户数统计
|
5 years ago |
luoyang
|
29283b0066
|
fix App时区
|
5 years ago |
luoyang
|
4b1939fb9f
|
fix App时区
|
5 years ago |
luoyang
|
c839f31b97
|
fix app夏令时
|
5 years ago |
luoyang
|
ef764cc2f8
|
add 广告位屏蔽同行业 1.2.47
|
5 years ago |
yixian
|
850090b0be
|
add logger for RetailAppMessage sender api
|
5 years ago |
luoyang
|
6c0cd35c52
|
fix 自助进件提交合规
|
5 years ago |
luoyang
|
57f2c80443
|
fix pom
|
5 years ago |
luoyang
|
685a6df62b
|
add 邮件密码 sysconfig表
|
5 years ago |
luoyang
|
f9feb9dbca
|
update 合同联系方式字段
|
5 years ago |
luoyang
|
875482d168
|
add 暂时删除rpay+水晶立牌
|
5 years ago |
duLingLing
|
5c1fbd6957
|
Upd:版本升级
|
5 years ago |
luoyang
|
880f16c4be
|
add 商户keyword搜索增加email && address
|
5 years ago |
luoyang
|
6869cbdd3f
|
fix pom.xml
|
5 years ago |
luoyang
|
c3a0a3aeb0
|
fix pom.xml
|
5 years ago |
yixian
|
c7ef885006
|
parent update, fix sandbox error
|
5 years ago |