taylor.dang
|
3ea7ced158
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
7edefd0a0d
|
[Y] 移除清算统计中商户清算统计
|
5 years ago |
yixian
|
4430a5ac4a
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
3008520c0a
|
sql优化
|
5 years ago |
|
taylor.dang
|
8f764f05ce
|
[Y] 删除重复mapper
|
5 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
|
5 years ago |
|
taylor.dang
|
bece7b0dc9
|
[Y] 商户欠款查询优化 & 清算记录免触发,限制最大查询周期30天 & 微信行业免刷新
|
5 years ago |
|
yixian
|
6529413836
|
sql优化
|
5 years ago |
|
yixian
|
f41db13db2
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
5f633305c1
|
更新autosql插件，sql优化（部分）
|
5 years ago |
luoyang
|
72637e1aa7
|
fix settle_month
|
5 years ago |
|
luoyang
|
2cce6ad198
|
fix settle_month
|
5 years ago |
|
luoyang
|
8b8ba802ad
|
fix settle_month
|
5 years ago |
|
luoyang
|
43f0852693
|
fix settle_month
|
5 years ago |
|
luoyang
|
4ad021d020
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
d9ebf26430
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
b3e7055917
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
3b37fbe4fc
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
102ed270e8
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
936c792b2c
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
d62dfbccc0
|
fix 二级商户查询三级商户
|
5 years ago |
|
luoyang
|
14fb7a32eb
|
fix 二级商户查询三级商户
|
5 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 |
|
luoyang
|
e3016f1025
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
luoyang
|
2ac7c7acec
|
fix 过滤掉合伙人BD
|
6 years ago |
|
yixian
|
1c82e7397b
|
Merge branch 'hotfix_send_editable_logs_only' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
|
6 years ago |
|
yixian
|
be4ee2a735
|
fix small warning
|
6 years ago |
|
luoyang
|
b948b326d5
|
fix Estimate
|
6 years ago |
|
luoyang
|
7ca7c0b3c9
|
fix Estimate
|
6 years ago |
|
luoyang
|
589977b2d8
|
fix Estimate
|
6 years ago |
|
luoyang
|
b4da9ca173
|
fix Estimate
|
6 years ago |
|
luoyang
|
35202a83de
|
fix Estimate
|
6 years ago |
|
luoyang
|
7ff7ad8058
|
revert
|
6 years ago |
|
luoyang
|
3c18b97142
|
tmp 测试remask 弹窗浮动
|
6 years ago |
|
luoyang
|
3df9dcfe2c
|
fix
|
6 years ago |
|
luoyang
|
a23ea19136
|
fix
|
6 years ago |
|
luoyang
|
4754d0b844
|
add transaction pos 条件
|
6 years ago |
|
luoyang
|
8db360ec4d
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
luoyang
|
8847a3af53
|
add transaction pos设备筛选条件
|
6 years ago |
|
james.zhao
|
2aaca574cd
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
6c48a15615
|
清算校验异常抛出
|
6 years ago |
|
james.zhao
|
0d3a353e59
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
8cf08d0026
|
alipay_online清算验证费率调整
|
6 years ago |
|
luoyang
|
fda28110b0
|
fix 清算验证 分页
|
6 years ago |
|
luoyang
|
b982336f76
|
fix 清算验证 分页
|
6 years ago |
|
james.zhao
|
b4ecfe8f15
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
d71faf795d
|
yeepay apply&update
|
6 years ago |
|
james.zhao
|
7c0f7cf4f6
|
yeepay sub update
|
6 years ago |
|
james.zhao
|
224ea3c64f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
0f6e1c550f
|
yeepay sub update
|
6 years ago |
|
luoyang
|
8d3605bf07
|
fix 过滤掉未开启微信支付的商户
|
6 years ago |
|
luoyang
|
8e0ef8cdbc
|
fix 删除测试方法
|
6 years ago |
|
luoyang
|
9c5b1eb6a4
|
fix
|
6 years ago |
|
luoyang
|
3c807a4050
|
add 测试商户重置密码微信推送 & tmpSend
|
6 years ago |
|
lujian
|
2dde2116c7
|
[fix]风控内部调单添加密送邮箱
|
6 years ago |
|
lujian
|
0b909d47ba
|
[fix]
|
6 years ago |
|
yixian
|
7be4235424
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
599c6f7b07
|
fix small warning
|
6 years ago |
|
james.zhao
|
ebf434c161
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
0da6e5f902
|
fix 过滤掉未开启微信支付的商户
|
6 years ago |
|
james.zhao
|
e42d6d03ba
|
Customs update
|
6 years ago |
|
luoyang
|
0da58ea321
|
fix 过滤掉未开启微信支付的商户
|
6 years ago |
|
james.zhao
|
eb0fa66c66
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
00eabd51aa
|
fix
|
6 years ago |
|
james.zhao
|
b539b0ca47
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
170677d696
|
api update
|
6 years ago |
|
james.zhao
|
f7560131a4
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
247a20d4fd
|
商户端报关页面
|
6 years ago |
|
james.zhao
|
2a0ef3b23b
|
报关接口API
|
6 years ago |
|
james.zhao
|
58cdd3d1cc
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
e2a21cf050
|
update
|
6 years ago |
|
james.zhao
|
5ca7c08b94
|
CB BankPay Api
|
6 years ago |
|
luoyang
|
8514460a5f
|
fix 15 50
|
6 years ago |
|
taylor.dang
|
6e3309768e
|
Merge branch 'develop'
|
6 years ago |
|
yixian
|
de10b4f846
|
attach sign params into redirection
|
6 years ago |
|
luoyang
|
8d64f75ff5
|
fix 修改合同细节 && 2015-2019版权信息
|
6 years ago |
|
james.zhao
|
70c18eda67
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
luoyang
|
b6fcdda787
|
fix 修改合同细节 && 2015-2019版权信息
|
6 years ago |
|
james.zhao
|
644d112b94
|
支付宝进件
|
6 years ago |
|
luoyang
|
ec70b21294
|
fix 修改合同细节 && 2015-2019版权信息
|
6 years ago |
|
lujian
|
12181a46ba
|
[fix]
|
6 years ago |
|
lujian
|
1e49ee0b9e
|
[fix]
|
6 years ago |
|
lujian
|
afe41aa77b
|
[fix]
|
6 years ago |
hellolujian
|
554da463bd
|
[fix]
|
6 years ago |
|
hellolujian
|
af936510c3
|
[fix]
|
6 years ago |
|
james.zhao
|
7118cb25c5
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
8c207e5e97
|
update
|
6 years ago |
|
taylor.dang
|
8e109ad2e3
|
支付宝进件接口
|
6 years ago |
|
james.zhao
|
222edd7430
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
b23ad3d782
|
补发红包
|
6 years ago |
|
james.zhao
|
84a8773325
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
47ddb3e3d9
|
update
|
6 years ago |
|
james.zhao
|
84a8fe9d31
|
update
|
6 years ago |
|
james.zhao
|
fb89c08f95
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
887e3e2268
|
update
|
6 years ago |
|
james.zhao
|
ba79b580b0
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# src/main/ui/static/analysis/templates/cheat_monitor_risk.html
|
6 years ago |
|
james.zhao
|
cb99428bcc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
254fdd9bb7
|
春节拆红包init
|
6 years ago |
|
lujian
|
ebaf807d23
|
[fix]
|
6 years ago |
|
lujian
|
db148d036f
|
[fix]wexin 解绑
|
6 years ago |
|
yixian
|
e576c675fd
|
ui bug fix
|
6 years ago |
|
yixian
|
6b6b26d540
|
ui bug fix
|
6 years ago |
|
yixian
|
64b6779ff8
|
ui bug fix
|
6 years ago |
|
yixian
|
375f0a3882
|
aba file remark from param outside
|
6 years ago |
|
lujian
|
7dc090209c
|
[fix]到账提醒通知页面
|
6 years ago |
|
luoyang
|
335290dc01
|
fix org commission year
|
6 years ago |
|
luoyang
|
48142e9f78
|
fix org commission year
|
6 years ago |
|
luoyang
|
75d93b5b56
|
fix
|
6 years ago |
|
luoyang
|
f9f7bb15bd
|
add app_style balance
|
6 years ago |
|
luoyang
|
e126326efa
|
add app_style balance
|
6 years ago |
|
yangkai
|
2a8feefb19
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
b5287202ae
|
fix
|
6 years ago |
|
yangkai
|
6bf22dabe7
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
3ad1a84834
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yangkai
|
ede4ec78ad
|
交易流水详情导出优化
|
6 years ago |
|
lujian
|
20c29056eb
|
[fix]
|
6 years ago |
|
lujian
|
4c7e643b59
|
[fix]
|
6 years ago |
|
lujian
|
8e7c57344d
|
[fix]
|
6 years ago |
|
lujian
|
4328c7ef5f
|
[fix]
|
6 years ago |
|
lujian
|
210a8aab48
|
[fix]
|
6 years ago |
|
lujian
|
a10d9ce765
|
[fix]
|
6 years ago |
|
lujian
|
efea8fc17a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
992037febc
|
[fix]
|
6 years ago |
|
lujian
|
acd366b849
|
[fix]支付宝调单修改
|
6 years ago |
|
lujian
|
f45b0985ea
|
[fix]
|
6 years ago |
|
james.zhao
|
8181a98074
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
3c5afc54f7
|
update
|
6 years ago |
|
james.zhao
|
50ea4adff3
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/system/core/impl/TradeSecureServiceHanyinImpl.java
# src/main/ui/static/payment/partner/templates/partner_edit.html
|
6 years ago |
|
james.zhao
|
f24f75ca14
|
v3
|
6 years ago |
|
yangkai
|
c55232b23d
|
alipay数据导出
|
6 years ago |
|
lujian
|
9b210a224e
|
[fix]
|
6 years ago |
|
lujian
|
e2a5e95b8f
|
[fix]
|
6 years ago |
|
lujian
|
560bf07c69
|
[fix]账单活动
|
6 years ago |
|
yangkai
|
2eb65aa920
|
royalpay快捷网银通道-商户渠道切换
|
6 years ago |
|
yangkai
|
4264a2bb75
|
支付通道交易列表添加交易商户数跟开通该渠道商户数
|
6 years ago |
|
yangkai
|
516a5014dc
|
fix导出商户交易流水详情
|
6 years ago |
|
yangkai
|
c40e0d8bb1
|
商户清算文件pdf导出
|
6 years ago |
|
luoyang
|
280887a75e
|
subpartner add store_name
|
6 years ago |
|
luoyang
|
5f12f2fc94
|
subpartner add store_name
|
6 years ago |
|
luoyang
|
8d85414086
|
fix
|
6 years ago |
|
luoyang
|
cc10219ebf
|
store_name 必填
|
6 years ago |
|
luoyang
|
5619d21469
|
store_name 必填
|
6 years ago |
|
luoyang
|
32295102ce
|
增加合伙人提成定时任务
|
6 years ago |
|
luoyang
|
070c2f7586
|
增加定时任务，每月一号0点15分生成合伙人提成
|
6 years ago |
|
luoyang
|
8b306885bc
|
temp 注释重复生成合伙人提成 限制
|
6 years ago |
|
luoyang
|
a0e2600382
|
增加 store_name 提醒
|
6 years ago |
|
luoyang
|
8464e51c9f
|
增加 store_name提醒
|
6 years ago |
|
luoyang
|
6824fda05d
|
fix
|
6 years ago |
|
luoyang
|
a289abd2fa
|
fix
|
6 years ago |
|
taylor.dang
|
e026399f05
|
remove clean remark
|
6 years ago |
|
taylor.dang
|
98a04939bd
|
remove clean remark
|
6 years ago |
|
luoyang
|
b42d17309b
|
fix
|
6 years ago |
|
luoyang
|
45deeca762
|
add store_name
|
6 years ago |
|
luoyang
|
422891997a
|
add store_name
|
6 years ago |
|
luoyang
|
7f28b588f0
|
add store_name
|
6 years ago |
|
luoyang
|
352efe1f7f
|
add store_name
|
6 years ago |
|
luoyang
|
94f0d3a134
|
add store_name
|
6 years ago |
|
luoyang
|
404b3825a8
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
luoyang
|
2272e5146b
|
add store_name
|
6 years ago |
|
yixian
|
444cc0427e
|
pom ver
|
6 years ago |
|
yixian
|
b4544295a8
|
pom ver
|
6 years ago |
|
yixian
|
f6eff7bb2e
|
secure file fix
|
6 years ago |
|
yixian
|
1178b46859
|
secure file fix
|
6 years ago |
|
luoyang
|
d05a3f9522
|
fix cb_bankpay
|
6 years ago |
|
luoyang
|
6bf626ba16
|
fix 合伙人提成支持CBBankPay
|
6 years ago |
|
james.zhao
|
0eea9ee276
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
yixian
|
0f6267d783
|
secure file fix
|
6 years ago |
|
james.zhao
|
0ac0b8bdbd
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
yixian
|
223e9c708f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
da629ca16b
|
fix bug
|
6 years ago |
|
james.zhao
|
314ca1b500
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
james.zhao
|
d62ff090aa
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
b33f657e83
|
update
|
6 years ago |
|
james.zhao
|
93d1075140
|
update
|
6 years ago |
|
taylor.dang
|
b14b693a26
|
hanyin
|
6 years ago |
|
james.zhao
|
98a5852056
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
james.zhao
|
85eb7fecf1
|
yeepay update
|
6 years ago |
|
yixian
|
08f3d06e66
|
config key edit
|
6 years ago |
|
yixian
|
a4e62a3bb5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
2e732bb770
|
secure upload manual api
|
6 years ago |
|
yangkai
|
141389f712
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
7b7b7079fa
|
商户端清算详情批量导出
|
6 years ago |
|
lujian
|
54fa46567a
|
[fix]
|
6 years ago |
|
lujian
|
a76a1a4cf5
|
[fix]
|
6 years ago |
|
lujian
|
b928ef8dfe
|
[fix]商户简称限制15字符
|
6 years ago |
|
lujian
|
0897d2ddb2
|
[fix]商户简称限制15字符
|
6 years ago |
|
yixian
|
4bb9cc96da
|
secure upload
|
6 years ago |
|
yixian
|
bb5d6dbd25
|
secure upload
|
6 years ago |
|
yixian
|
e43b4b0f42
|
secure upload
|
6 years ago |
|
james.zhao
|
3ac82ce0e3
|
update
|
6 years ago |
|
james.zhao
|
2f3502b49d
|
update
|
6 years ago |
|
james.zhao
|
650e579f95
|
yeepay sub init
|
6 years ago |
|
luoyang
|
e2c20576e4
|
fix try_alerts & alerts display_amount
|
6 years ago |
|
luoyang
|
67f73d7f7c
|
fix try_alerts & alerts display_amount
|
6 years ago |
|
luoyang
|
e7037350e5
|
fix saveSubMerchantId refresh
|
6 years ago |
|
luoyang
|
e2f050450b
|
fix saveSubMerchantId refresh
|
6 years ago |
|
yangkai
|
22dfb16a14
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
7d8ec01b19
|
fix
|
6 years ago |
|
james.zhao
|
f4b11ffad6
|
立牌图片更新
|
6 years ago |
|
yangkai
|
02efeb6f01
|
1.商户账号修改白名单
2.添加禁用筛选
|
6 years ago |
|
lujian
|
3fc305ac40
|
[fix]
|
6 years ago |
|
james.zhao
|
c5e2103bee
|
Merge branch 'develop'
|
6 years ago |
|
james.zhao
|
d91961b6d2
|
fix bug
|
6 years ago |
|
yangkai
|
6168190732
|
Merge branch 'develop'
|
6 years ago |
|
yangkai
|
01e3e8e234
|
hold commission
|
6 years ago |
|
yangkai
|
c0194eeca9
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
