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 |
|
luoyang
|
da102239b0
|
add app合规文件后端支持，修复后付费账户生成时间
|
5 years ago |
|
duLingLing
|
9821852514
|
Upd:部分查询数据接口查询数据源改为只读数据源
|
5 years ago |
|
duLingLing
|
b7631d79fa
|
Upd:部分查询数据接口查询数据源改为只读数据源
|
5 years ago |
|
duLingLing
|
1c35d35daa
|
Upd:退款接口添加数据指定为-只读库
|
5 years ago |
|
duLingLing
|
792dfe944f
|
Upd:退款接口添加数据指定为-只读库
|
5 years ago |
|
duLingLing
|
0a50e52c15
|
Upd:每日报表发送时间提前1小时
|
5 years ago |
|
duLingLing
|
56b18ed406
|
Upd:日账单KPI数据异常
|
5 years ago |
|
yixian
|
f590a95bb8
|
fix cast exception
|
5 years ago |
|
luoyang
|
50ba01ce48
|
fix 清算预估微信到账金额
|
5 years ago |
|
luoyang
|
832ce04069
|
fix risk页面 remark权限
|
5 years ago |
|
luoyang
|
ab67904720
|
fix dashboard settle开放pine
|
5 years ago |
|
luoyang
|
aa68308858
|
fix remark 软键盘导致remark确定失效
|
5 years ago |
|
luoyang
|
9bae7ca6cc
|
fix remark 软键盘导致remark确定失效
|
5 years ago |
|
luoyang
|
5af22be3b3
|
add 风控业务增加remark字段、修复repeat重复
|
5 years ago |
|
duLingLing
|
9b2a988805
|
Upd:日账单BD下新增商户数量
|
5 years ago |
|
luoyang
|
cbbfb39b58
|
fix 法人信息phone
|
5 years ago |
|
luoyang
|
40015c1b96
|
add App增加订单查询接口支持
|
5 years ago |
|
duLingLing
|
d30e9adeb1
|
Upd:管理端BD数据分析,手机端每日报表，变更查询新增商户逻辑为:统计BD下有效的新增商户,新转入商户
|
5 years ago |
|
luoyang
|
05667b73b0
|
fix 增加sub_manage查询接口
|
5 years ago |
|
luoyang
|
f9896bd95b
|
fix sub_manage switch切换
|
5 years ago |
|
luoyang
|
3692aca1cf
|
add 优化app交易流水查询sql分页、增加弹窗title返还
|
5 years ago |
|
luoyang
|
05aacadc40
|
add 时间截止后端返还
|
5 years ago |
|
luoyang
|
5e403680e2
|
fix 取消app默认7天查询时间
|
5 years ago |
|
luoyang
|
e522168292
|
fix 图片失败 onerror
|
5 years ago |
|
luoyang
|
caba08b6b6
|
fix 十月底截止提交文件
|
5 years ago |
|
luoyang
|
648b3b5f01
|
fix app修改法人信息
|
5 years ago |
|
luoyang
|
5ea9ba1afe
|
fix 城市为null
|
5 years ago |
|
luoyang
|
da9951c133
|
fix 城市为null
|
5 years ago |
|
taylor.dang
|
e43f890a24
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
4648b9885e
|
[Y] datasource
|
5 years ago |
|
duLingLing
|
536c691a20
|
Upd:更改数据源链接方式
|
5 years ago |
|
duLingLing
|
48c9ea9a3f
|
Upd:更改数据源链接方式
|
5 years ago |
|
taylor.dang
|
9962e459f8
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/pos/datasource/DataSourceConfiguration.java
|
5 years ago |
|
taylor.dang
|
9911ef697f
|
[Y] 修改 datasource 默认值
|
5 years ago |
|
duLingLing
|
d6a4cbf658
|
Upd:修复多数据源切换无效问题
|
5 years ago |
|
duLingLing
|
84a737c595
|
Upd:修复多数据源切换无效问题
|
5 years ago |
|
duLingLing
|
64d2467891
|
Upd:读写数据分离
|
5 years ago |
|
duLingLing
|
fc8f7545f1
|
Upd:读写数据分离
|
5 years ago |
|
duLingLing
|
638cbfd595
|
Upd:财务报表修改获取数据来源
|
5 years ago |
|
duLingLing
|
efef3adf74
|
Upd:财务报表修清算额修改查询sql
|
5 years ago |
|
duLingLing
|
d7fd91162e
|
Upd:财务报表修改获取数据来源
|
5 years ago |
|
liuxinxin
|
cd171f5bc2
|
[RoyalPay]新增Company name重复检测
|
5 years ago |
|
duLingLing
|
e68ea280a9
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
5 years ago |
|
duLingLing
|
3f2a8dc1ae
|
Upd:【财务报表】添加清算额数据
|
5 years ago |
|
liuxinxin
|
f67d08f1f6
|
[RoyalPay]新增Company name重复检测
|
5 years ago |
|
duLingLing
|
1fb4f23f9f
|
Upd:【财务报表】修改查询数据表,修改页面数据展示结构
|
5 years ago |
|
luoyang
|
d81de4673f
|
fix 优化风控权限
|
5 years ago |
|
luoyang
|
dcdd13da89
|
fix 优化风控权限
|
5 years ago |
|
luoyang
|
e0364eb6d2
|
fix 优化风控权限
|
5 years ago |
|
luoyang
|
bded6776c1
|
fix 优化风控权限
|
5 years ago |
|
luoyang
|
a04f2604db
|
fix 优化风控权限
|
5 years ago |
|
luoyang
|
92634654d8
|
fix 优化风控权限
|
5 years ago |
|
luoyang
|
b602e08f00
|
fix mailccs 为null
|
5 years ago |
|
luoyang
|
23297de309
|
fix mailccs 为null
|
5 years ago |
|
luoyang
|
507e95dea6
|
fix 销管增加风控业务
|
5 years ago |
|
luoyang
|
e8b67ee3be
|
fix 销管增加风控业务
|
5 years ago |
|
luoyang
|
ce207acfba
|
add App大额渠道开通弹窗
|
5 years ago |
|
luoyang
|
121a5361c0
|
add App大额渠道开通弹窗
|
5 years ago |
|
yangkai
|
ab8511c0b1
|
bd新增lakalapay渠道显示
|
5 years ago |
|
yixian
|
3158e6ffc0
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
b2c07291ac
|
document update
|
5 years ago |
|
luoyang
|
dc527461be
|
fix remark 只有合规和风控可以修改
|
5 years ago |
|
yixian
|
ef6e45caa4
|
parent version
|
5 years ago |
|
liuxinxin
|
cbf1c32e04
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
4eced16988
|
交易流水时间查询bug
|
5 years ago |
|
luoyang
|
de7ee5484d
|
fix 新增商户失败后client_pay_type and desc类型错误的问题
|
5 years ago |
|
luoyang
|
c612bee3ba
|
add 支付宝线上批量报备range
|
5 years ago |
|
luoyang
|
45286ac2d3
|
add 支付宝线上批量报备range
|
5 years ago |
|
luoyang
|
ca27ab3cf7
|
fix 退款占比预警增加风控人员微信推送
|
5 years ago |
|
luoyang
|
c3198044ca
|
add 管理mock商户端增加合规权限
|
5 years ago |
|
liuxinxin
|
864d433618
|
[RoyalPay]商户来源展示
|
5 years ago |
|
liuxinxin
|
ef29e82e96
|
[RoyalPay]商户来源展示
|
5 years ago |
|
liuxinxin
|
b510495890
|
[RoyalPay]商户来源展示
|
5 years ago |
|
liuxinxin
|
d65dc5d156
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
0aa6146da6
|
[RoyalPay]商户来源展示
|
5 years ago |
|
luoyang
|
52fda84527
|
fix 全量备份超时报错
|
5 years ago |
|
luoyang
|
8c32b331ad
|
add alipay online 全量备份
|
5 years ago |
|
todking
|
daa1635b2a
|
支付成功页面添加文字显示
|
5 years ago |
|
liuxinxin
|
02f4cb1675
|
[RoyalPay]商户雷同信息检测
|
5 years ago |
|
luoyang
|
b53b11a1a1
|
add 支付宝online insert partner批量报备
|
5 years ago |
|
todking
|
a3a9a1c499
|
fix 商户活跃度查询逻辑
|
5 years ago |
|
taylor.dang
|
cf78550b99
|
[Y] 通知推送商户名单为30天内活跃商户
|
5 years ago |
|
luoyang
|
b5e932c6e1
|
add CBBank手续费开关 && 增加clientconfig单独配置方法
boolean onlyModifyConfig
|
5 years ago |
|
liuxinxin
|
eecc2ea419
|
sarfari样式bug
|
5 years ago |
|
todking
|
f6d91e0ec9
|
fix 昨日开户数和当月开户数获取逻辑
|
5 years ago |
|
luoyang
|
d5d2e53e87
|
fix 组织合伙人权限
|
5 years ago |
|
luoyang
|
345e48cdd9
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
luoyang
|
27bbad34e3
|
fix 组织合伙人权限
|
5 years ago |
|
yixian
|
0f0f7a7b20
|
test unit
|
5 years ago |
|
yixian
|
227944d4d1
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
92bae223be
|
abafile remark template
|
5 years ago |
|
luoyang
|
5992f8c957
|
add 增加报备接口，输入商户编码批量报备
|
5 years ago |
|
luoyang
|
24f9b6d23f
|
fix 新建账号
|
5 years ago |
|
luoyang
|
6089228f38
|
fix 新建账号
|
5 years ago |
|
luoyang
|
41be5a173b
|
fix 组织管理员显示client payment info
|
5 years ago |
|
luoyang
|
dbc0af8bda
|
fix 组织管理员显示client payment info
|
5 years ago |
|
yixian
|
4c6e537b96
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
# src/main/ui/static/payment/partner/partner.js
|
5 years ago |
|
luoyang
|
5b7f5e43c5
|
add 新增组织管理员身份
|
5 years ago |
|
luoyang
|
991da8a68c
|
add 新增组织管理员
|
5 years ago |
|
todking
|
fe211e581f
|
fix 对接app，修改bean默认值和校验方式
|
5 years ago |
|
luoyang
|
c38da4ba27
|
fix client_pay_type desc可能为空
|
5 years ago |
|
luoyang
|
fcddc90fbc
|
fix client_pay_type desc可能为空
|
5 years ago |
|
luoyang
|
2bde5989c5
|
同步支付场景选择到商户端
|
5 years ago |
|
luoyang
|
ebc35d2050
|
add 同步支付场景到商户端
|
5 years ago |
|
luoyang
|
7529f0becd
|
add PINE商户重置密码后账户信息放置mongo
|
5 years ago |
|
luoyang
|
03353f0f3e
|
add PINE商户重置密码后账户信息放置mongo
|
5 years ago |
|
luoyang
|
d7991794e0
|
fix aus post
|
5 years ago |
|
luoyang
|
17c4207956
|
fix aus post
|
5 years ago |
|
luoyang
|
da3a9a1cb8
|
fix 修复dashboard lakala订单以及取消pine密码发送邮件
|
5 years ago |
|
luoyang
|
6c1b0d0826
|
fix 修复dashboard lakala订单以及取消pine密码发送邮件
|
5 years ago |
|
luoyang
|
7848f11eb7
|
fix app修改商户信息可能会导致client_pay_type异常
|
5 years ago |
|
luoyang
|
48f2151bc2
|
fix app修改商户信息可能会导致client_pay_type异常
|
5 years ago |
|
luoyang
|
074c380915
|
add 商户支付场景5个pos新渠道，以及对支付场景优化
|
5 years ago |
|
luoyang
|
f4f68c0d79
|
add 商户支付场景5个pos新渠道，以及对支付场景优化
|
5 years ago |
|
luoyang
|
435aa9740f
|
fixcbbank 安卓input偏移问题 && 手动清算同步
|
5 years ago |
|
luoyang
|
c02f29f802
|
fixcbbank 安卓input偏移问题 && 手动清算同步
|
5 years ago |
|
yixian
|
f6fbb00dce
|
手动清算申请提交时重置disable 状态
|
5 years ago |
|
taylor.dang
|
3aaf2d9953
|
全量开通CBPAY
|
5 years ago |
|
taylor.dang
|
288bf599c7
|
全量开通CBPAY
|
5 years ago |
|
taylor.dang
|
76c750c43b
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
taylor.dang
|
a30d4b34b9
|
全量开通商户 CBPAY
|
5 years ago |
|
yixian
|
61d247a7e2
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
1f8c0cb942
|
支付场景编码调整
|
5 years ago |
|
taylor.dang
|
4ece67e6aa
|
[Y] 修复每日自动化生成报表数据异常情况
|
5 years ago |
|
luoyang
|
92e28f6e8b
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
luoyang
|
2995bf5ba5
|
add 自助申请商户导出
|
5 years ago |
|
luoyang
|
ebcac47ea0
|
add 自助申请信息表格导出
|
5 years ago |
|
taylor.dang
|
6be7f13b37
|
[Y] 风控邮件新增风控指引
|
5 years ago |
|
luoyang
|
13d09ddf72
|
fix subpartner 同步商户编码设置
|
5 years ago |
|
luoyang
|
cd0f90d3ad
|
fix subpartner 同步商户编码
|
5 years ago |
|
luoyang
|
793cbbf02d
|
fix 英文支付成功页 金额重叠
|
5 years ago |
|
luoyang
|
b9d8612dc7
|
add 商户进件 商户编码检测
|
5 years ago |
|
luoyang
|
e1bdad97b8
|
fix website显示
|
5 years ago |
|
luoyang
|
a6aff4eece
|
fix website显示
|
5 years ago |
|
luoyang
|
81311254d3
|
add 商户编码自动生成，可刷新
|
5 years ago |
|
luoyang
|
37266365d3
|
add 商户编码自动生成，可刷新
|
5 years ago |
|
luoyang
|
8aebba2f38
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
luoyang
|
716937b333
|
fix 临时密码修复，过滤多余字段
|
5 years ago |
|
luoyang
|
94ec5961bd
|
fix
|
5 years ago |
|
luoyang
|
8328dfab95
|
fix 临时密码修复，过滤掉多余字段
|
5 years ago |
|
yangkai
|
f6232423e0
|
Merge branch 'develop'
|
5 years ago |
|
yangkai
|
d9de74472f
|
给datav提供飞线层数据、商家分布数据
|
5 years ago |
james.zhao
|
8bcb172305
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
james.zhao
|
c713b17447
|
kpi fix
|
5 years ago |
|
luoyang
|
b34b44dd29
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
luoyang
|
b88ceb315d
|
fix 合伙人提成负数抹除
|
5 years ago |
|
luoyang
|
8ab0b4f67f
|
fix 合伙人提成负数抹除
|
5 years ago |
|
james.zhao
|
3ea6fdd4ba
|
kpi开户数统计fix+团队交易量不屏蔽禁用BD
|
5 years ago |
|
luoyang
|
f23daac4d7
|
fix 合伙人提成 修复surcharge_cashback
|
5 years ago |
|
luoyang
|
642ef5e8a5
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
luoyang
|
7e90f05268
|
fix 初始化 client_pay_type
|
5 years ago |
|
luoyang
|
46cdad1985
|
fix 合伙人提成surcharge_cashback
|
5 years ago |
|
luoyang
|
6b7e764a70
|
fix 合伙人提成 修复surcharge_cashback
|
5 years ago |
|
james.zhao
|
1340b3963e
|
日报展示屏蔽支出
|
5 years ago |
|
james.zhao
|
877e057d38
|
日报展示屏蔽支出
|
5 years ago |
|
luoyang
|
72b505ee67
|
fix
|
5 years ago |
|
luoyang
|
b55dd13943
|
fix
|
5 years ago |
|
luoyang
|
810274f835
|
add 支付页切换清楚cache
|
5 years ago |
|
luoyang
|
4cd4ed85b9
|
add 支付页cache清除
|
5 years ago |
|
luoyang
|
6652fcd630
|
add yeepay product必填
|
5 years ago |
|
luoyang
|
eba63ac626
|
add yeepay product必填
|
5 years ago |
|
luoyang
|
819c3b2456
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
2954926da8
|
add 网银快捷支付新版支付页，可自由选择
|
5 years ago |
|
james.zhao
|
e1c14d3404
|
kpi
|
5 years ago |
|
taylor.dang
|
9947ce5377
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
18bfb7e593
|
[Y] 开放 cashier 菜单权限 & 临时子商户号标记
|
5 years ago |
|
james.zhao
|
47c7f03fd5
|
kpi fix
|
5 years ago |
|
james.zhao
|
e1f84ffc36
|
kpi 开户数统计
|
5 years ago |
|
taylor.dang
|
a6aa25206d
|
[Y] ignore
|
5 years ago |
|
luoyang
|
a86a0a3a8f
|
fix支付宝支付按钮
|
5 years ago |
|
luoyang
|
45a75e8477
|
fix支付宝支付按钮
|
5 years ago |
|
luoyang
|
bb6f49fe3c
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
luoyang
|
3880511a24
|
fix样式 增加按钮锁定
|
5 years ago |
|
luoyang
|
df475ca988
|
fix样式 增加按钮锁定
|
5 years ago |
yixian
|
82caf7a439
|
瀚银上传文件被截断问题修复，诊断接口调整
|
5 years ago |
|
yixian
|
351ac0c289
|
瀚银上传文件被截断问题排查
|
5 years ago |
|
yixian
|
c5d6ead7b9
|
瀚银上传文件被截断问题排查
|
5 years ago |
|
yixian
|
26c5c6c72d
|
瀚银上传文件被截断问题排查
|
5 years ago |
|
luoyang
|
1d0811d33a
|
fix 支付页v4 最大支付金额
|
5 years ago |
|
luoyang
|
09209d9b88
|
fix 支付页v4 最大支付金额
|
5 years ago |
|
luoyang
|
e6917173ca
|
add 支付页v4
|
5 years ago |
|
luoyang
|
31d02e18e0
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
luoyang
|
ead671cbd9
|
add 支付页v4
|
5 years ago |
|
luoyang
|
ba6b8d5676
|
同步
|
5 years ago |
|
luoyang
|
19517c9bb8
|
线上没有网站的用royalpay官网代替报备
|
5 years ago |
|
luoyang
|
ccb526fda1
|
fix 报备19年1月1日开始的线上商户
|
5 years ago |
|
luoyang
|
d48dd05b23
|
fix 报备19年1月到现在的线上商户
|
5 years ago |
|
luoyang
|
6f65cfd464
|
add 非主流渠道统计
|
6 years ago |
|
luoyang
|
bdb3ed6b14
|
add 非主流渠道统计
|
6 years ago |
|
james.zhao
|
bef0f373b1
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
todking
|
2e9093c1be
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
dc99a4399a
|
add 支付成功统计和广告点击统计
|
6 years ago |
|
luoyang
|
9a4ec43f40
|
fix 退款额度
|
6 years ago |
|
luoyang
|
f249a28113
|
fix 授信额度
|
6 years ago |
|
luoyang
|
4a8e19ce70
|
fix 自助申请
|
6 years ago |
|
luoyang
|
33276f8400
|
fix 自助申请
|
6 years ago |
|
luoyang
|
2cb35958f1
|
fix 自助申请
|
6 years ago |
|
luoyang
|
31f645c5f1
|
fix 自助申请
|
6 years ago |
|
luoyang
|
3d530fe3a4
|
fix 自助申请
|
6 years ago |
|
luoyang
|
22de253095
|
add good商品可配置项
|
6 years ago |
|
luoyang
|
f5a1de1d33
|
add good商品可配置项
|
6 years ago |
|
james.zhao
|
b66c671fd3
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/GatewayInfoModify.java
# src/main/java/au/com/royalpay/payment/manage/merchants/entity/impls/SwitchGatewaySignPermissionModify.java
|
6 years ago |
|
james.zhao
|
d2b5923c95
|
自主进件更新
|
6 years ago |
|
luoyang
|
9812fef948
|
fix board
|
6 years ago |
|
luoyang
|
0da36795eb
|
fix board
|
6 years ago |
|
luoyang
|
1f08a56397
|
fix v2 gateway 表主键
|
6 years ago |
|
luoyang
|
808e0eef58
|
fix v2 gateway 表主键
|
6 years ago |
|
luoyang
|
1223368fb6
|
fix v2 gateway 表主键
|
6 years ago |
|
luoyang
|
8273f8949e
|
fix v2 gateway 表主键
|
6 years ago |
|
luoyang
|
8e12b4b7e5
|
add v2 gateway商户配置
|
6 years ago |
|
luoyang
|
03a12fd812
|
add v2 gateway商户配置
|
6 years ago |
|
luoyang
|
c6e00a74db
|
fix Sub Partners Manage
|
6 years ago |
|
luoyang
|
a9110ac39f
|
fix Sub Partners Manage
|
6 years ago |
|
luoyang
|
b9d1040df0
|
add 三级商户子商户相互退款
|
6 years ago |
|
luoyang
|
a72c3f83e2
|
add 三级商户子商户相互退款
|
6 years ago |
|
luoyang
|
eb08f3193f
|
add 三级商户子商户相互退款
|
6 years ago |
|
luoyang
|
060390ca9d
|
fix 增加poster日志
|
6 years ago |
|
luoyang
|
25ef91379f
|
fix 后清算报表gst
|
6 years ago |
|
luoyang
|
36a7c7f335
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
luoyang
|
b3095e87bb
|
fix 后清算报表gst
|
6 years ago |
|
todking
|
3d035ca81c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
b8a37222d0
|
增加日志
|
6 years ago |
|
luoyang
|
b4c94c94d5
|
fix 客服二维码
|
6 years ago |
|
luoyang
|
fbea4cee5b
|
fix 客服二维码
|
6 years ago |
|
todking
|
166eb21e43
|
增加日志
|
6 years ago |
|
luoyang
|
c4c28c854b
|
fix 自助进件
|
6 years ago |
|
luoyang
|
9d89140d69
|
fix 自助进件
|
6 years ago |
|
luoyang
|
8969f32615
|
add 自助申请场景选择
|
6 years ago |
|
luoyang
|
ba5f37cbda
|
add 自助申请场景选择
|
6 years ago |
|
luoyang
|
c9491a438c
|
add 自助申请场景选择
|
6 years ago |
|
james.zhao
|
a60f1f40c5
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/merchants/enums/paymentScenarioEnum.java
# src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java
# src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html
# src/main/ui/static/payment/partner/templates/add_partner.html
|
6 years ago |
|
james.zhao
|
9186117ba3
|
日报开户数修复
|
6 years ago |
|
james.zhao
|
30aa2e5dc7
|
日报开户数修复
|
6 years ago |
|
luoyang
|
6988fa9d0e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
389aeeab8e
|
fix div
|
6 years ago |
|
luoyang
|
9094099cdf
|
fix div
|
6 years ago |
|
todking
|
3091d99045
|
统计支付成功页面的打开次数
统计支付成功页面里的每个广告点击次数
|
6 years ago |
|
luoyang
|
a171e587a4
|
fix 商户场景选择 图片可点击
|
6 years ago |
|
luoyang
|
dfe7645ca9
|
fix 商户场景选择 图片可点击
|
6 years ago |
|
luoyang
|
c57f7dd775
|
fix 商户场景选择
|
6 years ago |
|
luoyang
|
7df4f40bd7
|
add 商户场景选择
|
6 years ago |
|
luoyang
|
9ec7d35e21
|
add 商户场景选择
|
6 years ago |
|
yixian
|
7ffee061f0
|
退款金额排行查询
|
6 years ago |
|
luoyang
|
1549c64c08
|
fix 合规商品验证
|
6 years ago |
|
luoyang
|
fc83c27d87
|
fix 合规商品验证
|
6 years ago |
|
luoyang
|
eede0722f7
|
fix mcc
|
6 years ago |
|
luoyang
|
7d60b3607c
|
fix remove main test
|
6 years ago |
|
luoyang
|
998a18761d
|
add mcc
|
6 years ago |
|
luoyang
|
8ecc9344d0
|
fix 线下商户批量报备 有一种照片就进行报备
|
6 years ago |
|
luoyang
|
bd9e1731de
|
fix 线下商户批量报备 有一种照片就进行报备
|
6 years ago |
|
luoyang
|
2b516d51d0
|
add 线下商户批量报备
|
6 years ago |
|
luoyang
|
840e7cd264
|
add 线下商户批量报备
|
6 years ago |
|
luoyang
|
1c0696f412
|
fix 删除临时方法
|
6 years ago |
|
luoyang
|
3c0cd51c98
|
fix 删除临时方法
|
6 years ago |
|
luoyang
|
392da611d5
|
fix 同步order_channel为“AlipayOnline”的商户
|
6 years ago |
|
luoyang
|
11abda951a
|
fix 同步order_channel为“AlipayOnline”的商户
|
6 years ago |
|
luoyang
|
1892a8601a
|
fix 增加商户bd信息
|
6 years ago |
|
luoyang
|
3ae2c06286
|
fix 增加商户bd信息
|
6 years ago |
|
luoyang
|
06469a319a
|
fix 增加商户bd信息
|
6 years ago |
|
luoyang
|
d1e5f4c8ed
|
fix clientInfo null
|
6 years ago |
|
luoyang
|
7b21e4aec7
|
fix clientInfo null
|
6 years ago |
|
luoyang
|
f21e8ecdad
|
fix ui
|
6 years ago |
|
luoyang
|
9377bec8de
|
fix ui
|
6 years ago |
|
luoyang
|
e1d01a3a9f
|
add 批量报备支付宝线上商户
|
6 years ago |
|
luoyang
|
bdfd997d05
|
add 批量报备支付宝线上商户
|
6 years ago |
|
james.zhao
|
9370086ce6
|
css
|
6 years ago |
|
yixian
|
4b7fdec4de
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
c713dc0e7b
|
修改瀚银报备地址
|
6 years ago |
|
luoyang
|
e5717f0188
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
aa2fea8f71
|
fix 去掉representative_id
|
6 years ago |
|
luoyang
|
47496e6cb2
|
fix 去掉representative_id
|
6 years ago |
|
james.zhao
|
5b74779bd2
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
ae9346e670
|
kpi调整
|
6 years ago |
|
james.zhao
|
f8b8658bfd
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
3192310b80
|
kpi调整
|
6 years ago |
|
james.zhao
|
d961218ba1
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
6 years ago |
|
james.zhao
|
bb41d026b4
|
kpi修复
|
6 years ago |
|
luoyang
|
049e6705a3
|
fix 后清算手续费Invoice模板 选择回滚清算
|
6 years ago |
|
luoyang
|
552cc0e404
|
fix 后清算手续费Invoice模板 选择回滚清算
|
6 years ago |
|
luoyang
|
16d2138bae
|
add 后清算手续费Invoice模板
|
6 years ago |
|
luoyang
|
ac00e9052a
|
add 后清算invoice文件
|
6 years ago |
|
taylor.dang
|
336b1101f4
|
Merge branch 'develop'
|
6 years ago |
|
yixian
|
46e6bc6517
|
documents update
|
6 years ago |
|
yixian
|
4c4354f886
|
alipay online
|
6 years ago |
|
yixian
|
683a52e209
|
fix redirect on qrpay page
|
6 years ago |
|
james.zhao
|
98ed0042ab
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
taylor.dang
|
28f43ef26c
|
新增原生码接口
|
6 years ago |
|
taylor.dang
|
503447d08b
|
新增原生码接口
|
6 years ago |
|
james.zhao
|
bab6df82c3
|
revert
|
6 years ago |
|
james.zhao
|
923fea8b64
|
KPI每日报表
|
6 years ago |
|
yixian
|
f9462b391e
|
update mybatis-config
|
6 years ago |
|
yixian
|
0ed1de9c4c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
928103a4ff
|
tod 2019/5/16
图片样式修改
|
6 years ago |
|
james.zhao
|
c2c0f762e7
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
todking
|
a395ebb124
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
bf223182ba
|
tod 2019/5/16
图片地址错误改正
|
6 years ago |
|
taylor.dang
|
d2b86186fb
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
6 years ago |
|
taylor.dang
|
f7be05db7f
|
[Y] 1.0.4 version
|
6 years ago |
|
yangkai
|
df8fd8de14
|
BD提成明细新增Royapay手续费字段
|
6 years ago |
|
todking
|
bbf2aa3519
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
ae4b29f27f
|
tod 2019/5/15
发送邮件格式调整
|
6 years ago |
|
luoyang
|
022ed16a03
|
fix sql
|
6 years ago |
|
luoyang
|
30a0780558
|
fix sql
|
6 years ago |
|
james.zhao
|
65351aa733
|
登录页面更新
|
6 years ago |
|
james.zhao
|
bb647d6846
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
acb39590b8
|
登录页
|
6 years ago |
|
luoyang
|
bc3cbb76f6
|
fix 清算表格下载
|
6 years ago |
|
luoyang
|
47dbaed230
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
c9cefc84ad
|
fix 清算表格下载
|
6 years ago |
|
taylor.dang
|
238a01e8f9
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
85658da914
|
update
|
6 years ago |
|
taylor.dang
|
1fea8768c2
|
[Y] 移除异常主类
|
6 years ago |
|
taylor.dang
|
d8dcb19557
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
318b0e7872
|
商户授信额度
|
6 years ago |
|
yixian
|
dc02604db2
|
sql优化
|
6 years ago |
|
luoyang
|
f3f52ed8c6
|
fix transflow client_isds
|
6 years ago |
|
luoyang
|
6bb8427e7a
|
fix transflow client_isds
|
6 years ago |
|
taylor.dang
|
4050e36b3f
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
687739f06a
|
[Y] 手续费收支分离优化
|
6 years ago |
|
taylor.dang
|
ce1edb59f0
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
3e1ffb63d0
|
update
|
6 years ago |
|
taylor.dang
|
a0255266db
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
2755cd516e
|
[Y] 商户欠款功能优化
|
6 years ago |
|
taylor.dang
|
3ea7ced158
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
7edefd0a0d
|
[Y] 移除清算统计中商户清算统计
|
6 years ago |
|
yixian
|
4430a5ac4a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
3008520c0a
|
sql优化
|
6 years ago |
|
taylor.dang
|
8f764f05ce
|
[Y] 删除重复mapper
|
6 years ago |
|
taylor.dang
|
75a43ab60f
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
# src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
# src/main/ui/static/payment/partner/partner-manage.js
|
6 years ago |
|
taylor.dang
|
bece7b0dc9
|
[Y] 商户欠款查询优化 & 清算记录免触发,限制最大查询周期30天 & 微信行业免刷新
|
6 years ago |
|
yixian
|
6529413836
|
sql优化
|
6 years ago |
|
yixian
|
f41db13db2
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
5f633305c1
|
更新autosql插件，sql优化（部分）
|
6 years ago |
|
luoyang
|
72637e1aa7
|
fix settle_month
|
6 years ago |
|
luoyang
|
2cce6ad198
|
fix settle_month
|
6 years ago |
|
luoyang
|
8b8ba802ad
|
fix settle_month
|
6 years ago |
|
luoyang
|
43f0852693
|
fix settle_month
|
6 years ago |
|
luoyang
|
4ad021d020
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
d9ebf26430
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
b3e7055917
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
3b37fbe4fc
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
102ed270e8
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
936c792b2c
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
d62dfbccc0
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
14fb7a32eb
|
fix 二级商户查询三级商户
|
6 years ago |
|
luoyang
|
7382e6bce0
|
fix 手续费账户月度明细
|
6 years ago |
|
luoyang
|
f291d463a9
|
fix 手续费明细
|
6 years ago |
|
luoyang
|
e589bdc437
|
fix 隐藏后手续费支出和收入、月度充值
|
6 years ago |
|
luoyang
|
84505818ab
|
fix 隐藏后手续费支出和收入、月度充值
|
6 years ago |
|
luoyang
|
76b7d7a678
|
fix 子商户号
|
6 years ago |
|
luoyang
|
b331a217a5
|
fix 重构最近未交易子商户号逻辑\新增最后交易时间\时间区间选择
|
6 years ago |
|
james.zhao
|
8257104937
|
BD团队分析fix
|
6 years ago |
|
james.zhao
|
85d0a6275a
|
BD团队分析fix
|
6 years ago |
|
james.zhao
|
28a98c9784
|
BD团队分析
|
6 years ago |
|
james.zhao
|
80585d722c
|
BD团队分析
|
6 years ago |
|
luoyang
|
c4faa8236b
|
fix 自助进件 检测company_name
|
6 years ago |
|
luoyang
|
73b36fafcc
|
fix 自助进件 检测company_name
|
6 years ago |
|
luoyang
|
3179124d00
|
fix 报表优化
|
6 years ago |
|
luoyang
|
c7a598e2b4
|
fix T507
|
6 years ago |
|
luoyang
|
68f0586c4a
|
fix 三级商户退款
|
6 years ago |
|
luoyang
|
4e0e9af3ac
|
fix 三级商户退款
|
6 years ago |
|
luoyang
|
eae04120d8
|
fix show sub_partner
|
6 years ago |
|
luoyang
|
89108472b8
|
fix show sub_partner
|
6 years ago |
|
luoyang
|
c534762f60
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
a3a786d821
|
add 三级商户、报备信息不足提示、报备json显示
|
6 years ago |
|
taylor.dang
|
851ac8b50c
|
Merge branch 'develop'
|
6 years ago |
|
todking
|
a2971575e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
b10fb42bb1
|
tod 2019/4/18
页面修改
|
6 years ago |
|
taylor.dang
|
562b713a33
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
763cadd214
|
[Y] BD团队分析优化展示
|
6 years ago |
|
luoyang
|
28696ce91b
|
add 代理商提成下载表格
|
6 years ago |
|
luoyang
|
25e27dfd4b
|
add 代理商提成下载表格
|
6 years ago |
|
yixian
|
707085458e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
34ed131680
|
financial surcharge account detail analysis process fix
|
6 years ago |
|
todking
|
cdfdabfe1a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
4f197125db
|
tod 2019/4/17
将开关(Sub Partners Manage)移动子商户页面
并加上注释:开启后，父商户具有帮子商户新建账户、退款等管理权限
|
6 years ago |
|
taylor.dang
|
1c97b5e1fb
|
[Y] 父商户处理子商户交易验证
|
6 years ago |
|
taylor.dang
|
13c2dce603
|
fix
|
6 years ago |
|
taylor.dang
|
d173835b4f
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
# src/main/ui/static/payment/partner/templates/add_partner.html
|
6 years ago |
|
yangkai
|
b7aa93ba46
|
BD提成数据分析
|
6 years ago |
|
todking
|
51c05147ad
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
ddd8318f4d
|
tod 2019/4/15
修改所有的页面弹框属性
使所有的弹框不能点击空白处关闭，无关闭按钮的弹框添加关闭按钮
共修改24处（一处可有多个弹框）
|
6 years ago |
|
james.zhao
|
36f22ebabb
|
manager update
|
6 years ago |
|
james.zhao
|
c9d3368242
|
APP手机重置密码
|
6 years ago |
|
taylor.dang
|
f84a0a1777
|
[Y] 新建账户弹窗 & 提示修改密码弹窗
|
6 years ago |
|
luoyang
|
e59883442c
|
fix app推送证书位置
|
6 years ago |
|
luoyang
|
0fc05d2c58
|
fix app推送证书位置
|
6 years ago |
|
luoyang
|
2dbd4e9443
|
fix app timezone
|
6 years ago |
|
luoyang
|
333601bd86
|
fix app timezone
|
6 years ago |
|
luoyang
|
01388f97ff
|
fix app timezone
|
6 years ago |
|
luoyang
|
8fb39f1f8c
|
fix app timezone
|
6 years ago |
|
luoyang
|
394af694ca
|
fix app timezone
|
6 years ago |
|
luoyang
|
21f933a1da
|
fix app timezone
|
6 years ago |
|
todking
|
5c69bfb198
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
todking
|
d659dae643
|
2019/4/11
解决页面问题
1.新建组织管理员弹框仅允许cancel关闭
2.商户端修改密码弹窗会多次重叠，导致页面黑屏
|
6 years ago |
|
yangkai
|
7284a1393a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
edf1da46ae
|
交易数据渠道汇总数据
|
6 years ago |
|
taylor.dang
|
c46cd37278
|
[Y] 修复订单汇总缺少退款账务,清理部分硬编码url
|
6 years ago |
|
luoyang
|
545946d942
|
fix url
|
6 years ago |
|
luoyang
|
68a5778702
|
fix url
|
6 years ago |
|
taylor.dang
|
fb959f8715
|
[Y] 开发工具查询订单状态取order_channel
|
6 years ago |
|
james.zhao
|
01d3e3540b
|
FIX BUG
|
6 years ago |
|
james.zhao
|
f337be55fc
|
FIX BUG
|
6 years ago |
|
james.zhao
|
e4e4d6c60e
|
网银快捷CSS&JS
|
6 years ago |
|
james.zhao
|
7e61e0ee0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
55db943c76
|
FIX
|
6 years ago |
|
luoyang
|
a47b4ff763
|
fix TradeLogQuery
|
6 years ago |
|
luoyang
|
34687c0bf0
|
fix tradeLogQuery
|
6 years ago |
|
luoyang
|
d22d44ba96
|
fix format夏时令
|
6 years ago |
|
luoyang
|
baee192105
|
fix format夏時令
|
6 years ago |
|
james.zhao
|
afee1234a3
|
lakala手续费修复
|
6 years ago |
|
james.zhao
|
537a4f5b3c
|
update css
|
6 years ago |
|
james.zhao
|
a108cc15d3
|
yeepay css
|
6 years ago |
|
luoyang
|
a7920ffa89
|
add 后手续费功能完善，等invoice模板
|
6 years ago |
|
luoyang
|
f777b4cee4
|
commit 等待invoice模板
|
6 years ago |
|
luoyang
|
3c4c6f5b7d
|
fix getClearDetailTotal
|
6 years ago |
|
luoyang
|
652c076016
|
tmp commit fix getClearDetailTotal
|
6 years ago |
|
luoyang
|
2ad3ba5e73
|
commit tmp
|
6 years ago |
|
taylor.dang
|
c7eb4c23a8
|
[Y] api文档新增渠道方交易流水号(channel_order_id)
|
6 years ago |
|
luoyang
|
7d0f04cb4e
|
fix add_sub_partner
|
6 years ago |
|
luoyang
|
bbfe9fc594
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
d8703ad7fa
|
fix add_sub_partner
|
6 years ago |
|
taylor.dang
|
95a13ac5d6
|
[Y] api文档新增渠道方交易流水号(channel_order_id)
|
6 years ago |
|
luoyang
|
da31664b9b
|
fix add_sub_partner
|
6 years ago |
|
luoyang
|
754550bcba
|
fix 清算文件excel下载
|
6 years ago |
|
luoyang
|
1039a5a43c
|
fix 清算文件excel下载
|
6 years ago |
|
james.zhao
|
aef87d1147
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
d158177fb5
|
API更新
|
6 years ago |
|
james.zhao
|
dcc9529f93
|
报关定时任务
|
6 years ago |
|
james.zhao
|
73a3ee88b4
|
properties revert
|
6 years ago |
|
james.zhao
|
fba1e85c27
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
bf700de857
|
网银快捷支付整合，API更新
|
6 years ago |
|
luoyang
|
fd8ed9ffef
|
fix CBBank模板
|
6 years ago |
|
luoyang
|
e3750bef67
|
fix CBBank模板
|
6 years ago |
|
luoyang
|
663edb9e6c
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
93e5eb0a01
|
add 添加CBBank下载模板
|
6 years ago |
|
taylor.dang
|
33196e4bc7
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
164481b31f
|
移出无用变量
|
6 years ago |
|
luoyang
|
1cfd9dee7c
|
fix 资料完善中
|
6 years ago |
|
luoyang
|
42e82d5218
|
fix 资料完善中
|
6 years ago |
|
luoyang
|
f67e553a21
|
fix 资料完善中
|
6 years ago |
|
luoyang
|
d6223d3ae5
|
fix 资料完善中
|
6 years ago |
|
luoyang
|
05af52917c
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
# src/main/ui/static/analysis/risk_business.js
|
6 years ago |
|
james.zhao
|
6a84848cc4
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
0296a6936b
|
风控增加是否发送清算周期变更选项
|
6 years ago |
|
luoyang
|
78ff2e2df1
|
Merge branch 'develop_app_0307' into develop
# Conflicts:
# src/main/ui/manage.html
# src/main/ui/static/menu/templates/main_menu.html
# src/main/ui/static/payment/partner/partner-manage.js
|
6 years ago |
|
luoyang
|
09db19f7ee
|
tmp commit
|
6 years ago |
|
taylor.dang
|
72d1fe2f18
|
修复清算报表无法下载情况
|
6 years ago |
|
luoyang
|
d5c5aa2208
|
tmp commit
|
6 years ago |
|
luoyang
|
6db59b59d1
|
fix 合伙人提成 减掉surcharge_cashback
|
6 years ago |
|
luoyang
|
02fd5da0cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
0db91f904d
|
fix 合伙人提成 减掉surcharge_cashback
|
6 years ago |
|
taylor.dang
|
1ad4c6ec52
|
登录异常信息日志
|
6 years ago |
|
taylor.dang
|
460fe9a28d
|
新增异常信息日志
|
6 years ago |
|
luoyang
|
f222cc265d
|
tmp commit
|
6 years ago |
|
luoyang
|
ca8992219c
|
fix
|
6 years ago |
|
luoyang
|
2291ddcede
|
add 测试密码增加签名
|
6 years ago |
|
luoyang
|
8431d55341
|
测试密码微信模板 增加签名
|
6 years ago |
|
luoyang
|
72c7ae90f6
|
tmp commit
|
6 years ago |
|
taylor.dang
|
bc30a86d48
|
ignore
|
6 years ago |
|
taylor.dang
|
3db0c13c7d
|
inspiry设备管理
|
6 years ago |
|
taylor.dang
|
68ce23af11
|
默认设备类型
|
6 years ago |
|
taylor.dang
|
a658c1958f
|
新增添加pos设备
|
6 years ago |
|
luoyang
|
e25bbbbc53
|
fix
|
6 years ago |
|
luoyang
|
f585288e68
|
fix
|
6 years ago |
|
luoyang
|
9f1394df88
|
add 风控业务事件增加模板选择
|
6 years ago |
|
luoyang
|
dc87e9b82e
|
add 风控业务事件增加模板选择
|
6 years ago |
lujian
|
58c4947aa5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
a9b363fddf
|
Inspiry设备管理
|
6 years ago |
|
luoyang
|
f80f532c01
|
fix
|
6 years ago |
|
luoyang
|
759ac52efe
|
add 提成规则页面
|
6 years ago |
|
yangkai
|
d5571a8b59
|
BD规则说明更新
|
6 years ago |
|
lujian
|
83916a28fc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
3c221c1cd6
|
Merge branch 'develop' of D:\globalpay\9009_manage_develop\royalpay.manage with conflicts.
|
6 years ago |
|
luoyang
|
d799f1d43e
|
fix
|
6 years ago |
|
luoyang
|
65c5bda2ad
|
fix
|
6 years ago |
|
luoyang
|
26487813fc
|
fix representative_id
|
6 years ago |
|
luoyang
|
222edd4ba8
|
fix representative_id
|
6 years ago |
|
luoyang
|
c6d46a8b8f
|
fix representative_id
|
6 years ago |
|
luoyang
|
82d2385fde
|
tmp commit
|
6 years ago |
|
luoyang
|
1957b7775b
|
fix
|
6 years ago |
|
luoyang
|
75c68d965a
|
fix
|
6 years ago |
|
luoyang
|
5f726c71ec
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
20d0b6dcdf
|
Merge branch 'master_alipay_gms' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
|
6 years ago |
|
luoyang
|
bc2b86ad24
|
commit prod 测试
|
6 years ago |
|
luoyang
|
cffd93f282
|
temp commit
|
6 years ago |
|
yixian
|
7ad3c813a0
|
revoke settlement pay back to distributed surcharge
|
6 years ago |
|
luoyang
|
3c19d2ae93
|
temp commit
|
6 years ago |
|
taylor.dang
|
bf9b1464b6
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
4e150e4555
|
update
|
6 years ago |
|
yixian
|
c8fd66d3ad
|
hanyin reports
|
6 years ago |
|
james.zhao
|
c6272ac13f
|
fix bug
|
6 years ago |
|
james.zhao
|
bd6b088f52
|
fix
|
6 years ago |
|
james.zhao
|
c6f1a1aa54
|
settlement fix
|
6 years ago |
|
luoyang
|
73d7447603
|
add alipay online gms 等待回应 temp commit
|
6 years ago |
|
james.zhao
|
d04089a652
|
css update
|
6 years ago |
|
james.zhao
|
4c9079a2ff
|
yeepay 手动添加子商户号
|
6 years ago |
|
luoyang
|
e4427468a9
|
add app费率信息、文件
|
6 years ago |
|
james.zhao
|
58c85c9db1
|
lakala update
|
6 years ago |
|
james.zhao
|
aaca9aec7c
|
Lakala Init
|
6 years ago |
|
luoyang
|
691097fd17
|
add App银行信息接口
|
6 years ago |
|
luoyang
|
a885b6474a
|
fix 下载文件
|
6 years ago |
|
taylor.dang
|
82e93875a4
|
ignore
|
6 years ago |
|
taylor.dang
|
a022541c99
|
修改重置密码逻辑
|
6 years ago |
|
luoyang
|
cc46f27ee0
|
add org prize && bd kpi、rates
|
6 years ago |
|
yixian
|
472f1d2743
|
display settle time on merchant settlement history view on operation side
|
6 years ago |
|
yixian
|
ecbeff7ef8
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
93a71721fc
|
add jquery.cookie support
|
6 years ago |
|
james.zhao
|
f72e6af26b
|
RISK UPDATE
|
6 years ago |
|
luoyang
|
59d97cdb2f
|
增加财务平账权限
|
6 years ago |
|
luoyang
|
6879efdea2
|
fix 邮箱地址
|
6 years ago |
|
james.zhao
|
05874968ee
|
RISK UPDATE
|
6 years ago |
|
luoyang
|
4b7dbaaaab
|
commit commons
|
6 years ago |
|
luoyang
|
7733d8b59d
|
commit get version
|
6 years ago |
|
luoyang
|
b84e75478f
|
fix redis key
|
6 years ago |
|
luoyang
|
f9b4088561
|
add 登出、修改密码、商户进件、商户列表、商户详情
|
6 years ago |
|
yangkai
|
4182a60245
|
bd类型修改
|
6 years ago |
|
taylor.dang
|
e537a22a94
|
商户可设置订单过期时间
|
6 years ago |
|
luoyang
|
cff2f0d16d
|
add getReferrerList
|
6 years ago |
|
luoyang
|
4b2416c8ef
|
commit 登录、设备注册
|
6 years ago |
|
luoyang
|
99893846b1
|
tmp commit
|
6 years ago |
|
luoyang
|
f1bcd03b81
|
fix
|
6 years ago |
|
luoyang
|
94d4c8ac6d
|
test logger
|
6 years ago |
|
luoyang
|
8f1432f6e2
|
fix findClientByMoniker
|
6 years ago |
|
luoyang
|
38f51e2b81
|
add 风控调单微信模板推送
|
6 years ago |
|
luoyang
|
b7a5ff6961
|
fix ui
|
6 years ago |
|
taylor.dang
|
800e4059c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
taylor.dang
|
15bb19f2f0
|
修改gateway状态显示
|
6 years ago |
|
luoyang
|
1a7f53542c
|
fix getBalance
|
6 years ago |
|
luoyang
|
5c6f3a60c2
|
fix 日志记录
|
6 years ago |
|
james.zhao
|
ee04d98b58
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
luoyang
|
fc653ca1f9
|
add 后清算 收支分离模式
|
6 years ago |
|
james.zhao
|
85dda62035
|
update
|
6 years ago |
|
yangkai
|
9b465fe3aa
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
173881f899
|
注释除bd、bd_leader以外的提成显示
|
6 years ago |
|
yangkai
|
d577e12796
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
c0d7c20fe2
|
add alipay 报备
|
6 years ago |
|
yixian
|
b8d2303443
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
59ee2a617a
|
auto refresh captcha
|
6 years ago |
|
yangkai
|
6041f97e02
|
bd可以查看、下载自己的提成详情
|
6 years ago |
