yixian
|
1c1d851f1e
|
async logging
|
5 years ago |
luoyang
|
d8a543257c
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java
|
5 years ago |
|
yixian
|
a94405afa1
|
support oauth clients
|
5 years ago |
|
yixian
|
8edd0ca663
|
GetMapping/PostMapping....Replacement
settle_cent/settle_amount remark pattern
|
5 years ago |
|
luoyang
|
c5b5353c1e
|
fix 收银系统选择其他提示
|
5 years ago |
|
luoyang
|
088305e4c1
|
fix 收银系统选择其他提示
|
5 years ago |
|
luoyang
|
43cb33a26c
|
fix app订单流水查询过慢
|
5 years ago |
|
luoyang
|
6523740dcd
|
fix app订单流水查询过慢
|
5 years ago |
|
luoyang
|
95369a462b
|
fix open_status
|
5 years ago |
|
luoyang
|
0ad99dd1ad
|
fix 自助申请后 自动变为合同制作成功
|
5 years ago |
|
luoyang
|
70927ba6ec
|
fix 自助进件后 自动变成合同制作完成状态
|
5 years ago |
|
luoyang
|
dec14cdb27
|
fix 自助申请open_status 为2
|
5 years ago |
|
luoyang
|
9e7e7d9acb
|
fix open_status is null
|
5 years ago |
|
yixian
|
0d18988fc5
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
26dae2cedf
|
officedev profile
|
5 years ago |
|
luoyang
|
5d7a7405cd
|
fix 同步开关开启
|
5 years ago |
|
luoyang
|
1d845e6e34
|
fix
|
5 years ago |
|
luoyang
|
b5e7bd6321
|
add 活动开关
|
5 years ago |
|
yixian
|
791122cfa4
|
officedev profile
|
5 years ago |
liuxinxin
|
32caba09bb
|
Royal Pay 水晶立牌 海报更换
|
5 years ago |
|
liuxinxin
|
be4c59fdf5
|
royalpay 水晶立牌海报替换
|
5 years ago |
|
liuxinxin
|
b27014399c
|
[Royal Pay] 法人页面优化
|
5 years ago |
|
liuxinxin
|
847aef6596
|
[Royal Pay] 法人信息页面优化
|
5 years ago |
|
luoyang
|
9b06025060
|
add dashboard 缓存
|
5 years ago |
|
luoyang
|
8991e48c62
|
add dashboard 缓存
|
5 years ago |
|
liuxinxin
|
56f2a5d326
|
Royal Pay 缓存修改
|
5 years ago |
|
luoyang
|
b4e59c5a01
|
fix 合同地址
|
5 years ago |
|
luoyang
|
065730f8df
|
fix 合同地址
|
5 years ago |
|
luoyang
|
f51972623b
|
add 开通邮件发送联系人和法人、同步最新合同
|
5 years ago |
|
luoyang
|
7720cf8c13
|
fix 制作临时合同同步最新合同
|
5 years ago |
|
luoyang
|
6c6737a3b0
|
add 开通邮件发送联系人和法人、合同添加法人信息
|
5 years ago |
|
luoyang
|
9dffb9722d
|
fix bill code string
|
5 years ago |
|
luoyang
|
e74825e720
|
fix bill code string
|
5 years ago |
|
luoyang
|
e192096d71
|
fix 同步商户自助申请填写法人信息
|
5 years ago |
|
luoyang
|
665623698a
|
fix 同步商户自助申请填写法人信息
|
5 years ago |
|
luoyang
|
d28a4741be
|
add 同步商户自助申请填写法人信息
|
5 years ago |
|
luoyang
|
0554ae5ca6
|
add 同步商户自助申请填写法人信息
|
5 years ago |
|
liuxinxin
|
1bcf05993e
|
Royal Pay
|
5 years ago |
|
luoyang
|
d9c5ea99a6
|
fix 合规文件审核
|
5 years ago |
|
luoyang
|
2e5066ee23
|
fix 合规文件提交
|
5 years ago |
|
yixian
|
489ef0ed4d
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
f49939ec86
|
ato report
|
5 years ago |
|
luoyang
|
c77007dada
|
fix result string
|
5 years ago |
|
luoyang
|
9145135abd
|
fix result string
|
5 years ago |
duLingLing
|
e701d2a7c7
|
UPD:风控发送催促邮件无区分问题,更新版本
|
5 years ago |
|
duLingLing
|
b245b69991
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
5 years ago |
|
luoyang
|
3ae120844b
|
fix 开启合规材料补充
|
5 years ago |
|
luoyang
|
039e38e58f
|
fix 开启合规材料补充
|
5 years ago |
|
duLingLing
|
05228f2694
|
UPD:风控发送催促邮件无区分问题
|
5 years ago |
|
duLingLing
|
ff4ab51a1f
|
UPD:风控发送邮件模板无区别问题
|
5 years ago |
|
duLingLing
|
bb397c2e09
|
UPD:风控发送邮件模板无区别问题
|
5 years ago |
|
liuxinxin
|
7446d2ded6
|
royal法人信息展示bug
|
5 years ago |
|
liuxinxin
|
42cee0be15
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
6173d3256f
|
royalpay法人信息页面展示bug修复
|
5 years ago |
|
duLingLing
|
b4c0724b3d
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
duLingLing
|
585c9d5dcd
|
UPD:修复合伙人交易金额统计汇总重复
|
5 years ago |
|
duLingLing
|
7fa03d7a41
|
UPD:风控业务返回上一层不清空查询条件
|
5 years ago |
|
duLingLing
|
22a66b89c2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
5 years ago |
|
duLingLing
|
c01428bc1f
|
UPD:风控优化页面
|
5 years ago |
|
luoyang
|
2f07701a27
|
add put
|
5 years ago |
|
luoyang
|
dceab82811
|
fix fix_transaction put
|
5 years ago |
|
luoyang
|
2b2fd28573
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
eca3daf0d3
|
add 增加图片和web上传
|
5 years ago |
|
duLingLing
|
aceb124d3d
|
Upd:优化风控相关功能
|
5 years ago |
|
yixian
|
518f36d51e
|
ato report
|
5 years ago |
|
yixian
|
311dc316a1
|
ato report
|
5 years ago |
|
yixian
|
d419297e95
|
ato report
|
5 years ago |
|
yixian
|
107584b01e
|
ato report
|
5 years ago |
|
liuxinxin
|
243c2f4ea2
|
Royal Pay 修改
|
5 years ago |
|
liuxinxin
|
b8d30b4fbd
|
[RoyalPay] 需求修改
|
5 years ago |
|
yixian
|
cd67cdcd6d
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
99f8f69054
|
upgrade parent
|
5 years ago |
|
liuxinxin
|
834a5c66ba
|
bug修复
|
5 years ago |
taylor.dang
|
4bd61275f7
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
liuxinxin
|
0c5d3da7e1
|
[RoyalPay] 需求修改
|
5 years ago |
|
luoyang
|
5650fe1a7f
|
fix 暂时关闭补充资料模块
|
5 years ago |
|
luoyang
|
c72b62821b
|
fix 暂时关闭补充资料模块
|
5 years ago |
|
luoyang
|
a116631a34
|
add 商户签名增加ip、id、时间、设备信息字段，正式上线
|
5 years ago |
|
luoyang
|
13b7e81472
|
add 商户签名增加ip、id、时间、设备信息字段，正式上线
|
5 years ago |
|
luoyang
|
4d544fcda5
|
fix notify bd
|
5 years ago |
|
luoyang
|
f8963a18ba
|
fix notify bd
|
5 years ago |
|
luoyang
|
5cc0811af7
|
fix 下载合同
|
5 years ago |
|
luoyang
|
a98f780993
|
fix 下载合同
|
5 years ago |
|
yixian
|
a48446e302
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
7b487bd1ee
|
ui error
|
5 years ago |
|
luoyang
|
60d30ff865
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
39a39048e4
|
add 更新说明文件、只对测试商户测试
|
5 years ago |
|
luoyang
|
5718cb7a22
|
add 绿色通道、已通过商户补充合规资料、在线签署合同
|
5 years ago |
|
luoyang
|
f34a17e25c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
5 years ago |
|
luoyang
|
05ab1abd0c
|
fix 优化弹窗样式
|
5 years ago |
|
luoyang
|
f966c32ac5
|
fix 优化样式
|
5 years ago |
|
liuxinxin
|
fc8d48eee6
|
合同样式调整
|
5 years ago |
|
liuxinxin
|
2bc48120f6
|
合同制作
|
5 years ago |
|
luoyang
|
67318a4be1
|
fix 签名样式
|
5 years ago |
|
yixian
|
c4848c521f
|
ui error
|
5 years ago |
|
luoyang
|
0d09e5f1dc
|
add 文件上传失败pdf、清除用户缓存
|
5 years ago |
|
liuxinxin
|
c3abc56b62
|
loading样式
|
5 years ago |
|
liuxinxin
|
266bb75d97
|
合同
|
5 years ago |
|
liuxinxin
|
e7fd2d08a0
|
合同样式
|
5 years ago |
|
liuxinxin
|
ca263de4d1
|
合同
|
5 years ago |
|
liuxinxin
|
89373e11db
|
合同
|
5 years ago |
|
luoyang
|
83dc97fcd9
|
fix source=4 不需要补全文件
|
5 years ago |
|
luoyang
|
19db06bd53
|
fix return按钮
|
5 years ago |
|
luoyang
|
2f13b89f70
|
fix 合规文件为空的商户
|
5 years ago |
|
luoyang
|
dcb3ca2f68
|
add 合同在线签订
|
5 years ago |
|
liuxinxin
|
0cc49d7113
|
签名
|
5 years ago |
|
luoyang
|
cd7a8948a0
|
优化返回按钮
|
5 years ago |
|
liuxinxin
|
77a2a01c02
|
签名
|
5 years ago |
|
liuxinxin
|
cbcc7f1f07
|
签名
|
5 years ago |
todking
|
29a664095a
|
Merge branch 'master' into develop
|
5 years ago |
|
todking
|
eb55465a96
|
fix sql
|
5 years ago |
|
todking
|
b110fd0125
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
954dd83acf
|
fix ui
|
5 years ago |
|
todking
|
c01647f1d4
|
add 交易趋势接口
|
5 years ago |
|
liuxinxin
|
6c6fed89a6
|
合同
|
5 years ago |
|
luoyang
|
36facdf46c
|
fix
|
5 years ago |
|
luoyang
|
7e9b36605c
|
fix 制作合同返还数据
|
5 years ago |
|
luoyang
|
8cd237cd44
|
优化样式、屏蔽下载按钮
|
5 years ago |
|
luoyang
|
8cb8c5e027
|
add 合同client信息返还
|
5 years ago |
|
luoyang
|
ace8e86a09
|
优化首页弹窗样式
|
5 years ago |
|
liuxinxin
|
42d2356ffa
|
合同
|
5 years ago |
|
liuxinxin
|
51b929313d
|
合同
|
5 years ago |
|
liuxinxin
|
2526ce3aef
|
合同
|
5 years ago |
|
luoyang
|
38180850a4
|
fix 后手续费取字段
|
5 years ago |
|
luoyang
|
f5eb9ec4a4
|
fix 后手续费取字段
|
5 years ago |
|
luoyang
|
e4fee67e64
|
fix 后付费手续费前端显示、冲正金额
|
5 years ago |
|
luoyang
|
8ac67b1726
|
fix 后付费手续费前端显示、冲正金额
|
5 years ago |
|
liuxinxin
|
53fa4c29dd
|
合同
|
5 years ago |
|
liuxinxin
|
b0ee115770
|
fix
|
5 years ago |
|
luoyang
|
862acb6bc4
|
add app重复签订合同、web业务优化
|
5 years ago |
|
duLingLing
|
87c53b77ee
|
Upd:风控业务,修改内部调用人邮箱使用
|
5 years ago |
|
duLingLing
|
d6f4c64194
|
Upd:风控业务,修改内部调用人邮箱使用
|
5 years ago |
|
duLingLing
|
921cd42da8
|
Upd:风控业务,修改内部调用人邮箱使用
|
5 years ago |
|
duLingLing
|
a664f2b79a
|
Upd:风控业务,修改内部调用人邮箱使用
|
5 years ago |
|
duLingLing
|
36ad9966f0
|
Upd:发送风控邮件,删除ip显示,内部调用信息添加描述内容显示
|
5 years ago |
|
duLingLing
|
94dbe6f9de
|
Upd:发送风控邮件,删除ip显示,内部调用信息添加描述内容显示
|
5 years ago |
|
liuxinxin
|
20f6082399
|
商户合规材料
|
5 years ago |
|
taylor.dang
|
e7203bcf42
|
Merge branch 'develop'
|
5 years ago |
|
duLingLing
|
1c7fc80815
|
Upd:修复合伙人销量数据分析页面显示数据问题
|
5 years ago |
|
taylor.dang
|
20fe0a0602
|
Merge branch 'develop'
|
5 years ago |
|
liuxinxin
|
2668a3b9b8
|
Merge remote-tracking branch 'origin/develop_newAuthFile_T863' into develop_newAuthFile_T863
|
5 years ago |
|
liuxinxin
|
973915cde0
|
商户合规资料
|
5 years ago |
|
luoyang
|
b36e9d11c8
|
fix 优化代码
|
5 years ago |
|
liuxinxin
|
29b4ca0703
|
商户资料
|
5 years ago |
|
luoyang
|
eec19b4d3f
|
fix 合规审核文件界面
|
5 years ago |
|
duLingLing
|
946b4c8f94
|
Upd:数据完整性校对修改
|
5 years ago |
|
luoyang
|
f70cc938da
|
fix 代码优化
|
5 years ago |
|
liuxinxin
|
8524367385
|
商户资料
|
5 years ago |
|
liuxinxin
|
2367e27ed8
|
AlphaPayUS 账户创建bug修复
|
5 years ago |
|
yixian
|
089f7fc571
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
60baa2682a
|
aba file
|
5 years ago |
|
luoyang
|
5ccff0ef78
|
add app接口、代码优化
|
5 years ago |
|
luoyang
|
4703b26ede
|
revert 商户自助进件补充材料 html
|
5 years ago |
|
luoyang
|
43bc5f83c8
|
revert 商户自助进件补充材料js
|
5 years ago |
|
luoyang
|
263fbf42f4
|
add 代码优化、移动端新增合规文件状态
|
5 years ago |
|
luoyang
|
94ad879dc5
|
fix client_less_info
|
5 years ago |
|
liuxinxin
|
a4481c6c0e
|
商户合规资料不全，补充商户资料
|
5 years ago |
|
duLingLing
|
ed16bafbf6
|
Upd:修改sql别名使用错误问题
|
5 years ago |
|
luoyang
|
5822cbc520
|
add app 获取源合同文件、合成签名后文件url接口
|
5 years ago |
|
duLingLing
|
7da8c92566
|
Upd:修改定时任务时间
|
5 years ago |
|
duLingLing
|
24b3d742b2
|
Upd:修复查看合伙人数据误差
|
5 years ago |
|
taylor.dang
|
5a5f57901e
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
b52a5c063d
|
css
|
5 years ago |
|
taylor.dang
|
6eda5b1af0
|
css
|
5 years ago |
|
duLingLing
|
608652d093
|
Upd:修改定时任务时间
|
5 years ago |
|
duLingLing
|
52091e5de8
|
Upd:修改定时任务键名称
|
5 years ago |
|
yixian
|
6740488ef1
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
75a7461009
|
export merchant excel ui button
|
5 years ago |
|
luoyang
|
4dc79f41dd
|
fix 运营获取合规文件增加file_id
|
5 years ago |
|
luoyang
|
0e35c2759b
|
add 获取合规文件新接口 & 优化登陆返还字段
|
5 years ago |
|
duLingLing
|
2aa3f072fe
|
Upd:优化BD销量，合伙人交易量数据查询
Add:生成BD销量数据每日定时计算
|
5 years ago |
|
taylor.dang
|
e15f71a16e
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
042c95fed1
|
[Y]移除tax_in_surcharge操作：费率自动延期、上传商户材料等
|
5 years ago |
|
luoyang
|
06ba4946a1
|
Merge remote-tracking branch 'origin/develop_newAuthFile_T863_bak' into develop_newAuthFile_T863
|
5 years ago |
|
liuxinxin
|
f5229c62bc
|
[RoyalPay]网络端合规资料补全
|
5 years ago |
|
luoyang
|
6e0548c65a
|
fix for
|
5 years ago |
|
luoyang
|
e4e25acee9
|
add 合规文件可以上传多张 & 商户登陆后返还商户合规文件状态
|
5 years ago |
|
todking
|
672d58fec9
|
fix v4 js
|
5 years ago |
|
taylor.dang
|
7f0a0fcbd3
|
Merge branch 'develop'
|
5 years ago |
|
todking
|
c0f1988e6c
|
fix v4 css
|
5 years ago |
|
todking
|
deb7f8e261
|
fix v4 css
|
5 years ago |
|
todking
|
5b4f7a79e7
|
fix v4页面调整
|
5 years ago |
|
taylor.dang
|
9288919513
|
Merge branch 'develop'
|
5 years ago |
|
todking
|
a408b55326
|
fix 上传文件协议前端限制
|
5 years ago |
|
luoyang
|
cf7e8cbcaa
|
fix 风控业务
|
5 years ago |
|
luoyang
|
ef22be8f70
|
fix 风控业务
|
5 years ago |
|
luoyang
|
d11142e9bf
|
fix 风控业务 js
|
5 years ago |
|
luoyang
|
fdf5ac3038
|
add 风控确认收到风控材料按钮
|
5 years ago |
|
luoyang
|
af7885d671
|
add 风控确认收到风控材料按钮
|
5 years ago |
yangkai
|
25cf788682
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
yangkai
|
3d7007b46b
|
取消发送通知注释
|
5 years ago |
|
yangkai
|
e403fd54d6
|
1.订阅邮件
2.留言
3.自主申请
|
5 years ago |
|
yixian
|
21ced08f55
|
export merchant list to excel.
qcloud scf impl
|
5 years ago |
|
duLingLing
|
0e9e33842f
|
修改数据分析定时任务调用接口接口路径
|
5 years ago |
|
duLingLing
|
3c33f9688b
|
修改数据分析定时任务调用接口接口路径
|
5 years ago |
|
duLingLing
|
933c7232d3
|
添加数据分析定时任务调用接口
|
5 years ago |
|
duLingLing
|
e5b19f1503
|
添加数据分析定时任务调用接口
|
5 years ago |
|
taylor.dang
|
8f3049359d
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
74820c22af
|
[Y] 修复stuff 提成异常
|
5 years ago |
|
luoyang
|
8ebca81e8b
|
add app合规文件后端支持，修复后付费账户生成时间
|
5 years ago |
