luoyang
|
2f07701a27
|
add put
|
5 years ago |
|
luoyang
|
eca3daf0d3
|
add 增加图片和web上传
|
5 years ago |
yixian
|
cd67cdcd6d
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
99f8f69054
|
upgrade parent
|
5 years ago |
taylor.dang
|
aa3d042a7d
|
version
|
5 years ago |
|
luoyang
|
5650fe1a7f
|
fix 暂时关闭补充资料模块
|
5 years ago |
|
luoyang
|
a116631a34
|
add 商户签名增加ip、id、时间、设备信息字段，正式上线
|
5 years ago |
|
luoyang
|
2c85268ca6
|
fix pom
|
5 years ago |
|
luoyang
|
f8963a18ba
|
fix notify bd
|
5 years ago |
|
luoyang
|
5cc0811af7
|
fix 下载合同
|
5 years ago |
|
luoyang
|
5718cb7a22
|
add 绿色通道、已通过商户补充合规资料、在线签署合同
|
5 years ago |
todking
|
5dfd2e6197
|
fix pom
|
5 years ago |
|
todking
|
0e74888bea
|
fix pom
|
5 years ago |
|
luoyang
|
12256773b6
|
fix pom.xml
|
5 years ago |
duLingLing
|
d6f4c64194
|
Upd:风控业务,修改内部调用人邮箱使用
|
5 years ago |
|
duLingLing
|
a664f2b79a
|
Upd:风控业务,修改内部调用人邮箱使用
|
5 years ago |
|
duLingLing
|
94dbe6f9de
|
Upd:发送风控邮件,删除ip显示,内部调用信息添加描述内容显示
|
5 years ago |
|
duLingLing
|
1c7fc80815
|
Upd:修复合伙人销量数据分析页面显示数据问题
|
5 years ago |
|
duLingLing
|
45bf1b3d41
|
Upd:校对BD销量,合伙人提成数据完整性修改升级版本
|
5 years ago |
|
duLingLing
|
ed16bafbf6
|
Upd:修改sql别名使用错误问题
|
5 years ago |
|
duLingLing
|
7da8c92566
|
Upd:修改定时任务时间
|
5 years ago |
|
duLingLing
|
24b3d742b2
|
Upd:修复查看合伙人数据误差
|
5 years ago |
|
duLingLing
|
608652d093
|
Upd:修改定时任务时间
|
5 years ago |
|
duLingLing
|
52091e5de8
|
Upd:修改定时任务键名称
|
5 years ago |
|
duLingLing
|
a9dcf5ba30
|
Upd:升级版本
|
5 years ago |
|
taylor.dang
|
042c95fed1
|
[Y]移除tax_in_surcharge操作：费率自动延期、上传商户材料等
|
5 years ago |
|
luoyang
|
cf7e8cbcaa
|
fix 风控业务
|
5 years ago |
|
luoyang
|
9fddf8e0f9
|
fix pom.xml
|
5 years ago |
|
luoyang
|
af7885d671
|
add 风控确认收到风控材料按钮
|
5 years ago |
|
taylor.dang
|
603ce4bfde
|
[Y] pom
|
5 years ago |
|
yixian
|
21ced08f55
|
export merchant list to excel.
qcloud scf impl
|
5 years ago |
|
duLingLing
|
3c33f9688b
|
修改数据分析定时任务调用接口接口路径
|
5 years ago |
|
duLingLing
|
e5b19f1503
|
添加数据分析定时任务调用接口
|
5 years ago |
|
taylor.dang
|
74820c22af
|
[Y] 修复stuff 提成异常
|
5 years ago |
|
luoyang
|
da102239b0
|
add app合规文件后端支持，修复后付费账户生成时间
|
5 years ago |
|
duLingLing
|
bef5184e23
|
Upd:升级版本
|
5 years ago |
|
duLingLing
|
b7631d79fa
|
Upd:部分查询数据接口查询数据源改为只读数据源
|
5 years ago |
|
duLingLing
|
792dfe944f
|
Upd:退款接口添加数据指定为-只读库
|
5 years ago |
|
taylor.dang
|
4648b9885e
|
[Y] datasource
|
5 years ago |
|
taylor.dang
|
74e9350373
|
[Y] remove druid
|
5 years ago |
|
duLingLing
|
48c9ea9a3f
|
Upd:更改数据源链接方式
|
5 years ago |
|
taylor.dang
|
e690d5c0a1
|
[Y] pay version & pom version
|
5 years ago |
|
taylor.dang
|
9911ef697f
|
[Y] 修改 datasource 默认值
|
5 years ago |
|
duLingLing
|
d6a4cbf658
|
Upd:修复多数据源切换无效问题
|
5 years ago |
|
duLingLing
|
63282cea44
|
Upd:升级版本
|
5 years ago |
|
duLingLing
|
fc8f7545f1
|
Upd:读写数据分离
|
5 years ago |
|
duLingLing
|
efef3adf74
|
Upd:财务报表修清算额修改查询sql
|
5 years ago |
|
luoyang
|
1be1411e1f
|
fix pom.xml
|
5 years ago |
|
luoyang
|
b602e08f00
|
fix mailccs 为null
|
5 years ago |
|
luoyang
|
121a5361c0
|
add App大额渠道开通弹窗
|
5 years ago |
yangkai
|
ab8511c0b1
|
bd新增lakalapay渠道显示
|
5 years ago |
|
yixian
|
ef6e45caa4
|
parent version
|
5 years ago |
|
yixian
|
c52556eca5
|
parent version
|
5 years ago |
|
luoyang
|
c612bee3ba
|
add 支付宝线上批量报备range
|
5 years ago |
|
luoyang
|
45286ac2d3
|
add 支付宝线上批量报备range
|
5 years ago |
|
luoyang
|
ca27ab3cf7
|
fix 退款占比预警增加风控人员微信推送
|
5 years ago |
|
yixian
|
326e16838c
|
update parent version
|
5 years ago |
|
luoyang
|
52fda84527
|
fix 全量备份超时报错
|
5 years ago |
|
luoyang
|
8c32b331ad
|
add alipay online 全量备份
|
5 years ago |
|
luoyang
|
b53b11a1a1
|
add 支付宝online insert partner批量报备
|
5 years ago |
|
taylor.dang
|
f286a18c8c
|
[Y] pom version
|
5 years ago |
|
taylor.dang
|
cf78550b99
|
[Y] 通知推送商户名单为30天内活跃商户
|
5 years ago |
|
taylor.dang
|
41d15002d2
|
[Y] pom num
|
5 years ago |
|
yixian
|
92bae223be
|
abafile remark template
|
5 years ago |
|
yixian
|
ce4dd8ca7d
|
pom version
|
5 years ago |
|
yixian
|
7b487ff92e
|
pom version
|
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 |
|
yixian
|
092484a68b
|
pom version
|
5 years ago |
|
luoyang
|
5b7f5e43c5
|
add 新增组织管理员身份
|
5 years ago |
|
luoyang
|
7529f0becd
|
add PINE商户重置密码后账户信息放置mongo
|
5 years ago |
|
luoyang
|
da3a9a1cb8
|
fix 修复dashboard lakala订单以及取消pine密码发送邮件
|
5 years ago |
|
luoyang
|
48f2151bc2
|
fix app修改商户信息可能会导致client_pay_type异常
|
5 years ago |
|
taylor.dang
|
3aaf2d9953
|
全量开通CBPAY
|
5 years ago |
|
taylor.dang
|
288bf599c7
|
全量开通CBPAY
|
5 years ago |
|
luoyang
|
ebcac47ea0
|
add 自助申请信息表格导出
|
5 years ago |
|
luoyang
|
b9d8612dc7
|
add 商户进件 商户编码检测
|
5 years ago |
|
luoyang
|
bf94261baf
|
fix pom
|
5 years ago |
|
luoyang
|
8328dfab95
|
fix 临时密码修复，过滤掉多余字段
|
5 years ago |
|
yangkai
|
365d8ef3c8
|
添加版本号
|
5 years ago |
james.zhao
|
c713b17447
|
kpi fix
|
5 years ago |
|
james.zhao
|
3ea6fdd4ba
|
kpi开户数统计fix+团队交易量不屏蔽禁用BD
|
5 years ago |
|
luoyang
|
46cdad1985
|
fix 合伙人提成surcharge_cashback
|
5 years ago |
|
james.zhao
|
1340b3963e
|
日报展示屏蔽支出
|
5 years ago |
|
luoyang
|
bd49def962
|
fix
|
5 years ago |
|
luoyang
|
810274f835
|
add 支付页切换清楚cache
|
5 years ago |
|
luoyang
|
5eb476e82d
|
增加网银快捷支付新版页面
|
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 |
yixian
|
955e26b55e
|
瀚银上传文件被截断问题修复，诊断接口调整
|
5 years ago |
|
yixian
|
259487570d
|
瀚银上传文件被截断问题排查
|
5 years ago |
|
luoyang
|
19517c9bb8
|
线上没有网站的用royalpay官网代替报备
|
5 years ago |
|
luoyang
|
a855c5ff30
|
fix pom.xml
|
5 years ago |
|
luoyang
|
1b0bd191e6
|
fix pom.xml
|
5 years ago |
|
luoyang
|
ccb526fda1
|
fix 报备19年1月1日开始的线上商户
|
5 years ago |
|
luoyang
|
cd1e832a19
|
fix pom.xml
|
5 years ago |
|
james.zhao
|
dc05490ba9
|
pom update
|
5 years ago |
|
luoyang
|
9a4ec43f40
|
fix 退款额度
|
5 years ago |
|
luoyang
|
22de253095
|
add good商品可配置项
|
5 years ago |
|
james.zhao
|
d3ca70329f
|
自主进件更新
|
5 years ago |
|
luoyang
|
1f08a56397
|
fix v2 gateway 表主键
|
5 years ago |
|
luoyang
|
8273f8949e
|
fix v2 gateway 表主键
|
5 years ago |
|
luoyang
|
8e12b4b7e5
|
add v2 gateway商户配置
|
5 years ago |
|
luoyang
|
eb08f3193f
|
add 三级商户子商户相互退款
|
5 years ago |
|
luoyang
|
060390ca9d
|
fix 增加poster日志
|
5 years ago |
|
luoyang
|
25ef91379f
|
fix 后清算报表gst
|
5 years ago |
|
luoyang
|
fbea4cee5b
|
fix 客服二维码
|
5 years ago |
|
todking
|
166eb21e43
|
增加日志
|
5 years ago |
|
luoyang
|
ba5f37cbda
|
add 自助申请场景选择
|
5 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
|
5 years ago |
|
james.zhao
|
9186117ba3
|
日报开户数修复
|
5 years ago |
|
luoyang
|
7df4f40bd7
|
add 商户场景选择
|
5 years ago |
|
luoyang
|
fc83c27d87
|
fix 合规商品验证
|
5 years ago |
|
luoyang
|
eede0722f7
|
fix mcc
|
5 years ago |
|
luoyang
|
7d60b3607c
|
fix remove main test
|
5 years ago |
|
luoyang
|
b65c2734e4
|
fix pom.xml
|
5 years ago |
|
luoyang
|
bd9e1731de
|
fix 线下商户批量报备 有一种照片就进行报备
|
5 years ago |
|
luoyang
|
840e7cd264
|
add 线下商户批量报备
|
5 years ago |
|
luoyang
|
11abda951a
|
fix 同步order_channel为“AlipayOnline”的商户
|
5 years ago |
|
luoyang
|
06469a319a
|
fix 增加商户bd信息
|
5 years ago |
|
luoyang
|
7b21e4aec7
|
fix clientInfo null
|
5 years ago |
|
luoyang
|
e1d01a3a9f
|
add 批量报备支付宝线上商户
|
5 years ago |
|
luoyang
|
bdfd997d05
|
add 批量报备支付宝线上商户
|
5 years ago |
|
luoyang
|
588db33a61
|
fix pom.xml
|
5 years ago |
|
luoyang
|
aa2fea8f71
|
fix 去掉representative_id
|
5 years ago |
|
james.zhao
|
f3757ae2aa
|
kpi调整
|
5 years ago |
|
james.zhao
|
ca9d334c8a
|
kpi调整
|
5 years ago |
|
james.zhao
|
d961218ba1
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
552cc0e404
|
fix 后清算手续费Invoice模板 选择回滚清算
|
5 years ago |
|
luoyang
|
16d2138bae
|
add 后清算手续费Invoice模板
|
5 years ago |
|
luoyang
|
ac00e9052a
|
add 后清算invoice文件
|
5 years ago |
|
james.zhao
|
ece97e2e42
|
每日报表KPI
|
5 years ago |
|
james.zhao
|
f8ddc5abc0
|
邮件图片修复
|
5 years ago |
|
taylor.dang
|
0175e3bf4b
|
ignore
|
5 years ago |
|
taylor.dang
|
d2b86186fb
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
f7be05db7f
|
[Y] 1.0.4 version
|
5 years ago |
|
luoyang
|
022ed16a03
|
fix sql
|
5 years ago |
|
luoyang
|
30a0780558
|
fix sql
|
5 years ago |
|
luoyang
|
bc3cbb76f6
|
fix 清算表格下载
|
5 years ago |
|
luoyang
|
c9cefc84ad
|
fix 清算表格下载
|
5 years ago |
|
taylor.dang
|
238a01e8f9
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
df57c5502c
|
[Y] new version 1.0.1
|
5 years ago |
|
taylor.dang
|
d9795b6315
|
ignore
|
5 years ago |
|
taylor.dang
|
319521aad1
|
[Y] 新增jib构建
|
5 years ago |
|
taylor.dang
|
d8dcb19557
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
e68f7248eb
|
[Y] 新增jib构建
|
5 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 |
|
taylor.dang
|
a658c1958f
|
新增添加pos设备
|
6 years ago |
lujian
|
a9b363fddf
|
Inspiry设备管理
|
6 years ago |
|
james.zhao
|
ac8839be99
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
03720651b8
|
lakala
|
6 years ago |
|
luoyang
|
458e1ce90c
|
fix pom.xml
|
6 years ago |
|
yixian
|
b7914ba01c
|
pom version
|
6 years ago |
|
yangkai
|
5f1247a232
|
fix
|
6 years ago |
|
yixian
|
dd4e03e7f2
|
pom ver
|
6 years ago |
|
james.zhao
|
9c5f01958a
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
38da65cf72
|
Yeepay init
|
6 years ago |
|
luoyang
|
a8a1abda94
|
pom.xml
|
6 years ago |
|
luoyang
|
71daf269e4
|
fix pom.xml
|
6 years ago |
|
luoyang
|
9c2ee829d6
|
fix pom.xml
|
6 years ago |
|
luoyang
|
3831ea17ae
|
fix pom.xml
|
6 years ago |
|
luoyang
|
163c8e1976
|
0.2.0 -dev
|
6 years ago |
kira
|
cd97e18810
|
maven
|
6 years ago |
|
kira
|
ce3e896e89
|
add rpay merchant
|
6 years ago |
|
yixian
|
bef28c176e
|
settlement mail password source-dev version hotfix
|
6 years ago |
|
kira
|
fb4c1440cc
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/partner/templates/client_payment_info.html
|
6 years ago |
|
yixian
|
8321cfb724
|
ATO Report,
order channel support
|
6 years ago |
|
kira
|
4a36fa5cc0
|
maven
|
6 years ago |
|
kira
|
60586c9d4d
|
fixbug parent client invalid
|
6 years ago |
|
taylor.dang
|
05ca4d9a12
|
fix
|
6 years ago |
|
kira
|
439c8ce7cf
|
add log
|
6 years ago |
|
kira
|
00f638c4be
|
maven
|
6 years ago |
|
kira
|
85cfb5a188
|
maven
|
6 years ago |
|
yixian
|
3a0fbf5460
|
settlement detail
|
6 years ago |
|
kira
|
7b1991f71e
|
add pom
|
6 years ago |
eason
|
8becd67cf0
|
fix pom dev
|
6 years ago |
|
kira
|
4f6e35ad04
|
maven
|
6 years ago |
|
wangning
|
329d8fab4d
|
maven
|
6 years ago |
|
wangning
|
5b2ebb9d53
|
maven jar version
|
6 years ago |
|
wangning
|
d5b08c618b
|
add hf
|
6 years ago |
|
eason
|
bf70ee21e5
|
fix
|
6 years ago |
|
eason
|
9e4e4b85a5
|
fix
|
6 years ago |
|
wangning
|
fc744e9f0c
|
add hf
|
6 years ago |
|
wangning
|
45c8e9248c
|
update
|
6 years ago |
|
eason.qian
|
23258a78bb
|
Merge branch 'mailgun' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/task/PartnerInitEmailChecker.java
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
6 years ago |
|
wangning
|
2e01748e11
|
add maven test
|
6 years ago |
|
wangning
|
7e21301e7d
|
update
|
6 years ago |
|
eason.qian
|
3d0310cf02
|
fix
|
6 years ago |
|
wangning
|
2f1abf902a
|
add mongo
|
7 years ago |
|
wangning
|
de7a193402
|
Jpush
|
7 years ago |
|
yixian
|
7db1195937
|
init
|
7 years ago |
