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 |
