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 |