luoyang
|
12a18e643f
|
fix search date range
|
5 years ago |
|
luoyang
|
5e45653238
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
57e46bc170
|
add 商户类别交易趋势增加交易商户数数据
|
5 years ago |
|
luoyang
|
39812be745
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
a3b43675af
|
add 商户类别交易趋势增加百分比
|
5 years ago |
|
luoyang
|
b76f334637
|
fix 服务文件上传大小
|
5 years ago |
taylor.dang
|
7c15d9fd28
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
4413caa142
|
apidoc
|
5 years ago |
|
luoyang
|
f40804411e
|
fix 通知图片自适应问题
|
5 years ago |
|
luoyang
|
1166a67189
|
fix 通知图片大小问题
|
5 years ago |
|
luoyang
|
d160dd54f5
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
5307167a37
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
62371baf73
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
b17d6cb8ab
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
a1465a7a3b
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
de0215b823
|
fix 商户分类统计
|
5 years ago |
|
luoyang
|
8b8133d56a
|
fix 微信行业
|
5 years ago |
|
luoyang
|
8b45824440
|
fix 微信商户行业
|
5 years ago |
|
luoyang
|
1a737232b1
|
add 合规跳转商户端
|
5 years ago |
|
luoyang
|
2507d4b332
|
add 合规跳转商户端
|
5 years ago |
|
luoyang
|
17b5075d94
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/ui/static/payment/partner/templates/partners.html
# src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/GatewayApplicationMerchantDemoTest.java
|
5 years ago |
|
luoyang
|
c403863648
|
add RP商户类别交易统计
|
5 years ago |
|
luoyang
|
218e496b3d
|
fix gwt2 partner error
|
5 years ago |
|
luoyang
|
fd0b6c3e1d
|
fix gwt2 partner error
|
5 years ago |
|
luoyang
|
c981e127d2
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
d1fb4287f3
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
1dda04a9e5
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
5819cdc15b
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
ddedffa17f
|
fix 商户端transaction默认查询当天记录
|
5 years ago |
|
luoyang
|
8a45a4fffc
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
7457684dc5
|
fix 商户端transaction查询记录
|
5 years ago |
|
luoyang
|
8f1553163e
|
fix royalpay 完善行业信息
|
5 years ago |
|
luoyang
|
d24c861d37
|
fix royalpay 完善行业信息
|
5 years ago |
|
luoyang
|
06f2fc6e55
|
fix input css
|
5 years ago |
|
luoyang
|
70252f7f73
|
fix partners industry改为royalpay行业
|
5 years ago |
|
luoyang
|
4522cce652
|
fix partners industry改为royalpay行业
|
5 years ago |
|
luoyang
|
a4111e1fd4
|
fix 开通邮件、子商户chose改为more
|
5 years ago |
|
luoyang
|
40d044aca9
|
fix 开通邮件、子商户chose改为more
|
5 years ago |
|
luoyang
|
937ab0b05a
|
fix customer_surcharge_Rate max 3%
|
5 years ago |
|
luoyang
|
3eee11c204
|
fix customer_surcharge_Rate max 3%
|
5 years ago |
|
luoyang
|
0f5f1d66e0
|
fix customer_surcharge_Rate max 3%
|
5 years ago |
dulingling
|
a60134abf3
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
a827171295
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
15bc6b96de
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
|
dulingling
|
42946ee7af
|
Upd:修改商户详情remark字段长度提示
|
5 years ago |
yixian
|
14a7d49c81
|
build: 2.0.0 integration
|
5 years ago |
|
luoyang
|
f6ed3f1cea
|
add 单元测试
|
5 years ago |
|
luoyang
|
3d17c1fc82
|
fix parnters
|
5 years ago |
|
luoyang
|
792d54782f
|
fix parnters
|
5 years ago |
|
luoyang
|
2ef267d046
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
0626d466e5
|
feat(validate report): validation view show if there is error
|
5 years ago |
|
yixian
|
7b6f71cf84
|
feat(validate report): validation view show if there is error
|
5 years ago |
|
yixian
|
a9ee640f81
|
feat(validate report): validation view show if there is error
|
5 years ago |
|
yixian
|
804fc0c9e8
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
c43a7e2816
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
1534515ee3
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
5af9537a6c
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
3e0a5f8690
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
yixian
|
1a9a653274
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
386b748ff4
|
feat(settle report): download settle report excel from ui
|
5 years ago |
|
luoyang
|
7b7f23fb68
|
add 商户自定义配置 hide_mch_device 隐藏设备
|
5 years ago |
|
luoyang
|
6efe8ce301
|
add 商户自定义配置 hide_mch_device 隐藏设备
|
5 years ago |
|
luoyang
|
3575037feb
|
fix 增加测试账号leoh
|
5 years ago |
|
luoyang
|
674ae4b1f8
|
fix 增加测试账号leoh
|
5 years ago |
|
luoyang
|
f9c5355635
|
add partner tarde clientMoniker shortName
|
5 years ago |
|
luoyang
|
4ea0eafdff
|
add partner tarde clientMoniker shortName
|
5 years ago |
|
luoyang
|
3d397c7f7e
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
f864b7c695
|
add level3_mch_config 自动配置
|
5 years ago |
|
yixian
|
98a8ea0e58
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
1522b5fd15
|
fix(settle ui): up update, email template update
|
5 years ago |
|
luoyang
|
8c75c1dc3b
|
fix ka商户子商户检索支持
|
5 years ago |
|
luoyang
|
e74a8327a9
|
fix ka商户子商户检索支持
|
5 years ago |
|
luoyang
|
97ea891948
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
04d44f8bef
|
add ka商户子商户检索支持
|
5 years ago |
|
yixian
|
4fdbd23058
|
fix(settle ui): title update
|
5 years ago |
|
yixian
|
45fd54ee6f
|
fix(settle ui): checkbox error
|
5 years ago |
|
yixian
|
0639015bbf
|
fix(settle ui): checkbox error
|
5 years ago |
|
yixian
|
18bfcd4ca3
|
feat(settle ui): ui update
|
5 years ago |
|
yixian
|
160003e4d3
|
feat(settle ui): ui update
|
5 years ago |
|
yixian
|
15e0d5262b
|
feat(settle ui): ui update
|
5 years ago |
|
yixian
|
ec2fff9cb4
|
feat(settle ui): 测试环境清算邮件增加TEST标记
|
5 years ago |
|
yixian
|
33bb32c8e9
|
feat(settle ui): 清算发送UI修改
|
5 years ago |
|
yixian
|
1df9609149
|
feat(settle ui): 清算发送勾选发送是否标记已发送
|
5 years ago |
|
yixian
|
381e68467d
|
feat(settle ui): 清算发送勾选发送是否标记已发送
|
5 years ago |
|
yixian
|
61bd70e283
|
feat(settle ui): ui dockerfile
|
5 years ago |
|
yixian
|
132b7e15ca
|
feat(settle ui): ui dockerfile
|
5 years ago |
|
yixian
|
dc9b211ae3
|
feat(settle ui): 清算发送勾选发送批次，取消每日一次发送邮件限制，取消验证码
|
5 years ago |
|
yixian
|
7ee7ababe1
|
feat(settle ui): 清算发送勾选发送批次，取消每日一次发送邮件限制，取消验证码
|
5 years ago |
|
dulingling
|
8e763a191d
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
2b921b92c3
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
45a75ac289
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
929dcfb427
|
Upd:修改计算新老消费者人头数，每日数据生成逻辑
|
5 years ago |
|
dulingling
|
b19d14ab7a
|
Upd:添加指定商户消费者数据重生接口
|
5 years ago |
|
dulingling
|
482bb9721d
|
Upd:修改计算新老消费者人头数，每日数据生成逻辑
|
5 years ago |
|
luoyang
|
ff779faa60
|
add shortname rsvc
|
5 years ago |
|
luoyang
|
5fb3e409da
|
add shortname rsvc
|
5 years ago |
|
luoyang
|
366004e46c
|
delete app not found test
|
5 years ago |
|
luoyang
|
1e28b924ec
|
fix 跨境商城app 测试
|
5 years ago |
|
luoyang
|
7b0162ca44
|
fix 跨境商城app 测试
|
5 years ago |
|
luoyang
|
d355719e41
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
cd9d937a11
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
dfc7293005
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
381e26453c
|
fix 跨境商城优化、gateway进件优化
|
5 years ago |
|
luoyang
|
8bec790b96
|
add rsvc返回CompanyName
|
5 years ago |
|
luoyang
|
c53575f30c
|
add rsvc返回CompanyName
|
5 years ago |
|
luoyang
|
f84f6266c1
|
add rsvc增加abn\acn字段
|
5 years ago |
|
luoyang
|
30669c7413
|
add rsvc增加abn\acn字段
|
5 years ago |
|
luoyang
|
1837cf3e80
|
add rsvc增加abn\acn字段
|
5 years ago |
|
luoyang
|
497303cbfe
|
fix gateway merchant transaction fee
|
5 years ago |
|
luoyang
|
2e0dfb2683
|
fix gateway merchant transaction fee
|
5 years ago |
|
luoyang
|
1df4b4b0a9
|
fix 优化商户增加营销联系人
|
5 years ago |
|
luoyang
|
67068b881b
|
fix 优化商户增加营销联系人
|
5 years ago |
|
luoyang
|
86a4566606
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
# src/main/ui/static/incrementalService/templates/partner_incremental_service.html
|
5 years ago |
|
luoyang
|
3f123eee41
|
add App 弹窗黑名单功能
|
5 years ago |
|
luoyang
|
7575fb56b9
|
delete app not found test
|
5 years ago |
|
luoyang
|
c899b637a4
|
delete app not found test
|
5 years ago |
|
luoyang
|
ab7829e9d5
|
add app not found test
|
5 years ago |
liuxinxin
|
a415340f32
|
【R】 商户详情新增对接人信息
|
5 years ago |
|
liuxinxin
|
f663749d51
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
7afb445dde
|
【R】 商户详情新增对接人信息
|
5 years ago |
|
luoyang
|
e4a0a4ebfa
|
fix app boolean int
|
5 years ago |
|
luoyang
|
e26ca469fd
|
fix app boolean int
|
5 years ago |
|
luoyang
|
94caf65194
|
fix app boolean int
|
5 years ago |
|
luoyang
|
85e0ae4a50
|
fix app boolean int
|
5 years ago |
|
luoyang
|
370ea700ea
|
fix app boolean int
|
5 years ago |
|
luoyang
|
9573490887
|
fix app boolean int
|
5 years ago |
|
luoyang
|
592adef19c
|
fix app 弹窗次数
|
5 years ago |
|
luoyang
|
1088e2bbdc
|
fix app 弹窗次数
|
5 years ago |
|
luoyang
|
8cb57da60d
|
fix app 弹窗次数
|
5 years ago |
|
luoyang
|
2959cea5d0
|
fix app orders新增字段geek_apply_deduction
|
5 years ago |
|
luoyang
|
c68cffaf71
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
89789c92e7
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
3e2ee72ddf
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
90aeded68c
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
3cc9623569
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
4a31e07c82
|
fix 跨境商城修改
|
5 years ago |
|
luoyang
|
e32493f654
|
add 跨境商城RP付费扣款 增加扣款订单
|
5 years ago |
|
luoyang
|
0625d12394
|
add 跨境商城RP付费扣款 增加扣款订单
|
5 years ago |
|
luoyang
|
fd1ef72dac
|
add 跨境商城RP付费扣款 增加扣款订单
|
5 years ago |
|
luoyang
|
c40fce1926
|
fix app orders test
|
5 years ago |
|
luoyang
|
ca277ca708
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
5 years ago |
|
luoyang
|
1433b9960f
|
add popup增加显示次数控制
|
5 years ago |
|
luoyang
|
ccfabff97d
|
add popup增加显示次数控制
|
5 years ago |
|
luoyang
|
40cd2efb7b
|
fix geek prod url
|
5 years ago |
|
luoyang
|
c4ccd9c558
|
fix geek prod url
|
5 years ago |
|
luoyang
|
140fe334ee
|
fix geek act
|
5 years ago |
|
luoyang
|
a4194c2686
|
fix geek act
|
5 years ago |
|
liuxinxin
|
b9f137ee34
|
【R】商户Invoice接口
|
5 years ago |
|
liuxinxin
|
1193f70c05
|
【R】商户Invoice接口
|
5 years ago |
|
luoyang
|
74d0ca7365
|
fix pom.xml
|
5 years ago |
|
luoyang
|
8a7f673dfa
|
fix 优化中文接口地址
|
5 years ago |
|
luoyang
|
abe96475ac
|
fix 模糊查询
|
5 years ago |
|
luoyang
|
e26490808b
|
fix 模糊查询
|
5 years ago |
|
luoyang
|
72ff8eb390
|
add 弹窗+banner增加版本检测、商户端增加商户订单id、平台订单模糊查询、交易流水增加search框
|
5 years ago |
|
luoyang
|
2c16633450
|
add 弹窗+banner增加版本检测、商户端增加商户订单id、平台订单模糊查询、交易流水增加search框
|
5 years ago |
|
luoyang
|
11ceb92396
|
fix 活动页新增枚举popup
|
5 years ago |
|
luoyang
|
e69c031067
|
fix 活动页新增枚举popup
|
5 years ago |
|
luoyang
|
42e03548dd
|
fix 活动页新增枚举popup
|
5 years ago |
|
luoyang
|
7824f998de
|
fix 活动页新增枚举popup
|
5 years ago |
|
luoyang
|
f4201385da
|
fix 跨境商城使用详情页面
|
5 years ago |
|
luoyang
|
08f9903011
|
fix 跨境商城使用详情页面
|
5 years ago |
|
luoyang
|
d28f40fb67
|
fix 跨境商城使用详情页面
|
5 years ago |
|
luoyang
|
e1c5c005c5
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
c735bc500f
|
fix 跨境商城使用详情页面
|
5 years ago |
|
luoyang
|
963dbc7040
|
add 开店状态通知、app扫码接口增加source参数
|
5 years ago |
|
luoyang
|
8885a01cd4
|
add 开店状态通知、app扫码接口增加source参数
|
5 years ago |
|
luoyang
|
3bdfe71314
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
20200198c8
|
add app弹窗运营修改
|
5 years ago |
|
luoyang
|
34947478c7
|
fix login $http
|
5 years ago |
|
luoyang
|
7d3e242295
|
fix login $http
|
5 years ago |
|
luoyang
|
c903eea8da
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
a31f127c26
|
add App扫码同时单点登录跨境商城
|
5 years ago |
|
luoyang
|
ff5a3cbc46
|
fix 商服弹窗只针对pine开放
|
5 years ago |
|
luoyang
|
240d88b5ac
|
fix 商服弹窗只针对pine开放
|
5 years ago |
|
taylor.dang
|
55c4f0508a
|
fix
|
5 years ago |
|
taylor.dang
|
9ff6822f57
|
AP进件
|
5 years ago |
|
taylor.dang
|
4270218381
|
AP进件
|
5 years ago |
|
taylor.dang
|
a838820de2
|
AP进件
|
5 years ago |
|
taylor.dang
|
e76ab9af54
|
AP进件
|
5 years ago |
|
taylor.dang
|
5eec4dd892
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
1155160248
|
AP进件
|
5 years ago |
|
luoyang
|
defd9df6f4
|
fix getAppActPopup
|
5 years ago |
|
luoyang
|
a8afc43437
|
fix getAppActPopup
|
5 years ago |
|
luoyang
|
3341ff3ff1
|
add logger debug
|
5 years ago |
|
luoyang
|
e3e27241fd
|
fix transflow pdf clientIds
|
5 years ago |
|
luoyang
|
fb436d375a
|
fix transflow pdf clientIds
|
5 years ago |
|
luoyang
|
0c7afb545c
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
6bd1effa06
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
dd5b00a097
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
14ca83c3c0
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
d354ad2be9
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
fbcca3a69b
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
14921df45a
|
fix transflow clientIds
|
5 years ago |
|
luoyang
|
66deba0e80
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
b53dbf98dc
|
add 单点登录、app通用弹窗接口
|
5 years ago |
|
dulingling
|
2e20929642
|
Upd:运营端消费者排名排序
|
5 years ago |
|
dulingling
|
01f5e0266f
|
Upd:运营端用户数据分析增加金额于订单量删选排序
|
5 years ago |
|
dulingling
|
4b3a940c18
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
5 years ago |
|
dulingling
|
365516cb03
|
Upd:运营端消费者排名排序
|
5 years ago |
|
luoyang
|
21e0629793
|
fix 跨境商城扣款接口
|
5 years ago |
|
luoyang
|
4da54d7219
|
fix 跨境商城扣款接口
|
5 years ago |
|
luoyang
|
c00eb0ffc5
|
fix 跨境商城扣款接口
|
5 years ago |
|
dulingling
|
96b5139d97
|
Upd:运营端用户数据分析增加金额于订单量删选排序
|
5 years ago |
|
luoyang
|
2d8fdaece4
|
fix maven cache
|
5 years ago |
|
luoyang
|
2825e64a9e
|
fix rsvc
|
5 years ago |
|
luoyang
|
06f27a32cf
|
fix params
|
5 years ago |
|
luoyang
|
56a2726ef8
|
fix rServer listen
|
5 years ago |
|
luoyang
|
3342b331e5
|
fix rServer listen
|
5 years ago |
|
luoyang
|
4fabe349cd
|
fix summary下载20条问题
|
5 years ago |
|
luoyang
|
6c6b656e10
|
fix summary下载20条问题
|
5 years ago |
|
luoyang
|
38b3e36540
|
fix summary下载20条问题
|
5 years ago |
|
luoyang
|
4bb094afa0
|
fix summary下载20条问题
|
5 years ago |
|
luoyang
|
79697622d7
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
0b0161f7a3
|
fix 进件api删除多余行业，增加RsvcServer接口
|
5 years ago |
|
taylor.dang
|
332bb249aa
|
fix
|
5 years ago |
|
taylor.dang
|
0af4bac9ee
|
ignore
|
5 years ago |
|
taylor.dang
|
94073272f1
|
ignore
|
5 years ago |
|
taylor.dang
|
68c4af820b
|
[Y] 商户新增禁止显示子商户选项开关
|
5 years ago |
|
luoyang
|
d12af68c4a
|
fix gateway error message
|
5 years ago |
|
luoyang
|
cf7e72ffd1
|
fix gateway error message
|
5 years ago |
|
luoyang
|
a81e45678d
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
cdc151b7ee
|
add 子商户分页
|
5 years ago |
|
liuxinxin
|
31cdea2303
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
7d7c3d53c4
|
[Rp] 子商户分页
|
5 years ago |
|
luoyang
|
1f607ffa4b
|
fix url pom.xml
|
5 years ago |
|
luoyang
|
b2db3346d2
|
fix gateway url
|
5 years ago |
|
luoyang
|
4f3b391c79
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
33723c228c
|
fix controller org
|
5 years ago |
|
luoyang
|
ac20d64c6a
|
fix dev controller class
|
5 years ago |
|
luoyang
|
73856d61af
|
fix dev controller class
|
5 years ago |
|
luoyang
|
64318e5ce1
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
934ae97579
|
fix revert api doc文档
|
5 years ago |
|
luoyang
|
44e44af0bb
|
add gateway 商户进件相关功能
|
5 years ago |
|
yixian
|
922d9c3d9c
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
1f20c0f34e
|
清算文件合并
|
5 years ago |
|
taylor.dang
|
12f0e0e454
|
remove redpack mp
|
5 years ago |
|
taylor.dang
|
5b1bb5d48c
|
remove redpack mp
|
5 years ago |
|
luoyang
|
246ef08ab8
|
1.3.24 增加surcharge_rate 字段，后续未调整
|
5 years ago |
|
luoyang
|
64cd668a94
|
1.3.23 增加surcharge_rate 字段，后续未调整
|
5 years ago |
|
taylor.dang
|
0582321556
|
[Y] 新增禁止查询level3商户开关
|
5 years ago |
|
yixian
|
d19bc70a16
|
presettle undo processing
|
5 years ago |
|
dulingling
|
0c5ff3ef26
|
Upd:客户订单交易数据修改为无交易也显示日期
|
5 years ago |
|
dulingling
|
073df7b0ee
|
Upd:客户订单交易数据修改为无交易也显示日期
|
5 years ago |
|
taylor.dang
|
2859c8bf4c
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
86a754451c
|
remove alipay loginid
|
5 years ago |
|
taylor.dang
|
05e57f0592
|
update
|
5 years ago |
|
liuxinxin
|
d9c35e0d8f
|
[R] fix
|
5 years ago |
|
liuxinxin
|
21d7513222
|
[R] fix
|
5 years ago |
|
liuxinxin
|
c7fd744070
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
|
5 years ago |
|
liuxinxin
|
947609278d
|
[R] 开发工具 查询报关情况
|
5 years ago |
|
luoyang
|
efb0ca968f
|
fix order source
|
5 years ago |
|
luoyang
|
2d47d888b3
|
fix order source
|
5 years ago |
|
luoyang
|
1fe36f7429
|
fix order source
|
5 years ago |
|
luoyang
|
186c1d6494
|
fix order source
|
5 years ago |
|
luoyang
|
4ac279ebac
|
fix divers修复
|
5 years ago |
|
luoyang
|
dbad89e3ab
|
fix divers修复
|
5 years ago |
|
luoyang
|
84f9945182
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
ee1e41f66b
|
add kyc update
|
5 years ago |
|
luoyang
|
58ca831443
|
delete debug
|
5 years ago |
|
luoyang
|
adf69142cd
|
debug v4 input监听问题
|
5 years ago |
|
luoyang
|
c752d2c33f
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
9da043de5c
|
add 清算表格增加dev remark
|
5 years ago |
|
liuxinxin
|
bc49f7667d
|
[R] fix
|
5 years ago |
|
liuxinxin
|
e1aa4830fa
|
[R] fix
|
5 years ago |
|
yixian
|
e5b2015fef
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
36bb909d06
|
update apns certificate
|
5 years ago |
|
taylor.dang
|
c86d277cf0
|
[Y] fix bd prize bug
|
5 years ago |
|
taylor.dang
|
b2e5392b69
|
fix BD prize bug
|
5 years ago |
|
liuxinxin
|
ee863ce2f1
|
[R] fix
|
5 years ago |
|
liuxinxin
|
83f089979c
|
[R] fix
|
5 years ago |
|
luoyang
|
6d36bd329c
|
fix 第一次kyc材料商户过滤
|
5 years ago |
|
luoyang
|
627bb20ab4
|
fix 第一次kyc材料商户过滤
|
5 years ago |
|
yixian
|
c0004b6f82
|
apn message cert
|
5 years ago |
|
yixian
|
d7cae44e8a
|
app message sending api update
|
5 years ago |
|
yixian
|
233701e450
|
app message sending api update
|
5 years ago |
|
yixian
|
c1ee861a7a
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
473b965151
|
app message sending api update
|
5 years ago |
|
liuxinxin
|
d79c78822e
|
Merge branch 'develop'
|
5 years ago |
|
liuxinxin
|
cc383d474b
|
[R] APP端接口调整
|
5 years ago |
|
dulingling
|
0404b35b1f
|
Add:添加支付宝支付页面
|
5 years ago |
|
yixian
|
5ea3a11d87
|
app message sending api update
|
5 years ago |
|
liuxinxin
|
ed78df8443
|
Merge branch 'develop'
|
5 years ago |
|
liuxinxin
|
d8424f736f
|
[R] 接口调整
|
5 years ago |
|
liuxinxin
|
c34427c24e
|
[R] APP端接口调整
|
5 years ago |
|
liuxinxin
|
073fa81ccd
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
8af398e674
|
[R] 接口调整
|
5 years ago |
|
taylor.dang
|
69bc0b7bbf
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
633736fadc
|
[Y] 报关
|
5 years ago |
|
liuxinxin
|
1fac5ac08c
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
7b0e172c50
|
[R] APP端接口调整
|
5 years ago |
|
taylor.dang
|
a8f7b306b7
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
4c975e8485
|
csv charset fix
|
5 years ago |
|
taylor.dang
|
f91f498a13
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
3b6db8dff5
|
ui update
|
5 years ago |
|
yixian
|
50f92d69cb
|
export csv
|
5 years ago |
|
liuxinxin
|
9815aba6e7
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
liuxinxin
|
b35e33fc0a
|
[R] APP端接口调整
|
5 years ago |
|
luoyang
|
0bcba6b809
|
fix kyc notify
|
5 years ago |
|
luoyang
|
87e686c1b5
|
fix kyc notify
|
5 years ago |
|
luoyang
|
fa7e289d51
|
fix wx notify
|
5 years ago |
|
luoyang
|
6f8f7183a6
|
fix wx notify
|
5 years ago |
|
luoyang
|
7949ad9e8a
|
Merge branch 'develop'
|
5 years ago |
|
luoyang
|
8b02624f62
|
Merge branch 'develop_T1249' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
5 years ago |
|
luoyang
|
362c081020
|
add 内部测试
|
5 years ago |
|
duLingLing
|
08a3b998c4
|
Add:新增微信支付页面
|
5 years ago |
|
duLingLing
|
c71b44eef4
|
Add:新增微信支付页面
|
5 years ago |
|
luoyang
|
71b80bae57
|
fix wx notify
|
5 years ago |
|
luoyang
|
49bbdf2deb
|
fix wx notify
|
5 years ago |
|
luoyang
|
0cc2c35a82
|
fix pom.xml
|
5 years ago |
|
luoyang
|
5dbfe62631
|
fix rservice apply notify i18n
|
5 years ago |
|
luoyang
|
81ef18360a
|
fix rservice apply
|
5 years ago |
|
luoyang
|
e9af1d97ab
|
fix rservice apply
|
5 years ago |
|
luoyang
|
31dcb12e8c
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
2691047d15
|
add 合规审核R-services扣款申请，接收来自Rservices的扣款申请推送
|
5 years ago |
|
liuxinxin
|
b2e548c672
|
[R] APP端接口
|
5 years ago |
|
liuxinxin
|
9c46e24f90
|
[R] 优化
|
5 years ago |
|
liuxinxin
|
6513f627f8
|
[R] 细节优化
|
5 years ago |
|
liuxinxin
|
514cfa899f
|
[R]fix
|
5 years ago |
|
liuxinxin
|
db1f6275e5
|
[R] fix
|
5 years ago |
|
liuxinxin
|
2f9a2b46ef
|
[R] 弹窗优化
|
5 years ago |
|
luoyang
|
073bba4e5a
|
fix 优化前端代码
|
5 years ago |
|
luoyang
|
8e8781c7e2
|
fix 优化获取原合同接口
|
5 years ago |
|
liuxinxin
|
14d0ec1b5f
|
[R] PASS
|
5 years ago |
|
luoyang
|
2d3e1709a1
|
fix 优化获取文件接口
|
5 years ago |
|
liuxinxin
|
bbcdf0f0ac
|
[R]只能提交一张
|
5 years ago |
|
liuxinxin
|
fe20ca1f1c
|
[R]合规审核页面三级路由
|
5 years ago |
|
liuxinxin
|
3c093c8857
|
[R]KCY认证Web端开发
|
5 years ago |
|
liuxinxin
|
4fff0e0de6
|
[R]KCY认证Web端开发
|
5 years ago |
|
luoyang
|
ffc7c56810
|
add 优化前端代码，增加三级路由
|
5 years ago |
|
luoyang
|
9a44943177
|
fix ui
|
5 years ago |
|
liuxinxin
|
edca1fef29
|
[R]商户信息添加KYC文件展示
|
5 years ago |
|
duLingLing
|
35d834473d
|
Upd:修复提供接口错误字段
|
5 years ago |
|
duLingLing
|
f906f0d9c8
|
Upd:修复提供接口错误字段
|
5 years ago |
|
luoyang
|
0d5c44d26f
|
add 增加按钮跳转、bd上传文件修复
|
5 years ago |
|
liuxinxin
|
79193155b2
|
[R]fix
|
5 years ago |
|
luoyang
|
801aab3d83
|
fix 优化前端代码
|
5 years ago |
|
luoyang
|
eca84799a1
|
fix 优化前端代码
|
5 years ago |
|
luoyang
|
05b882b5f1
|
fix 位置迁移,优化合规审核页面
|
5 years ago |
|
taylor.dang
|
8f26512222
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
taylor.dang
|
eea73c3b20
|
[Y] R service新增参数 & 修改清算文件
|
5 years ago |
|
luoyang
|
8457814c0d
|
add 增加bd handle textarea 完善bd帮助流程
|
5 years ago |
|
luoyang
|
adc653509b
|
add 优化代码、增加BD端handle操作（无法提供文件原因未完善、提交操作未核验）
|
5 years ago |
|
liuxinxin
|
d466f2fc0f
|
[R]KCY认证Web端开发
|
5 years ago |
|
luoyang
|
9eeb3070f0
|
fix 进度条初始位置
|
5 years ago |
|
luoyang
|
40b36c432a
|
add 商户KYC认证进度百分比
|
5 years ago |
|
liuxinxin
|
e2d411b60f
|
[R]KCY认证Web端开发
|
5 years ago |
|
luoyang
|
97effc720b
|
add 商户申请BD帮助后，邮件推送、微信推送
|
5 years ago |
|
luoyang
|
6daa0cf640
|
add 商户kyc进度
|
5 years ago |
|
duLingLing
|
2dd4ababbf
|
Upd:服务提供spms读取数据结构查询条件
|
5 years ago |
|
duLingLing
|
bcafcdcb29
|
Upd:服务提供spms读取数据结构查询条件
|
5 years ago |
|
liuxinxin
|
0b7616f212
|
[R]KCY认证Web端开发
|
5 years ago |
|
liuxinxin
|
01ce838f9f
|
[R] Merchant Id Applicaitons fix
|
5 years ago |
|
liuxinxin
|
024d2ae611
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
c71203450d
|
[R] Merchant Id Applicaitons fix
|
5 years ago |
|
taylor.dang
|
a67e34f96a
|
Merge branch 'develop'
|
5 years ago |
|
yixian
|
e2ba914c1c
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
24f3a628cd
|
documents update
|
5 years ago |
|
duLingLing
|
df2ca7aa75
|
Merge branch 'develop'
|
5 years ago |
|
liuxinxin
|
c0ce6adbc1
|
[R] R Services fix
|
5 years ago |
|
duLingLing
|
ddb9f1a8d2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
5 years ago |
|
duLingLing
|
98309e68b1
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
|
5 years ago |
|
liuxinxin
|
87b472f489
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
28e6bcc2f1
|
[R] R Services fix
|
5 years ago |
|
duLingLing
|
5ad67054eb
|
Upd：商户交易流水，订单列表增加第三方设备筛选条件
|
5 years ago |
|
taylor.dang
|
4f171c5d22
|
[Y] log
|
5 years ago |
|
taylor.dang
|
c125302385
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
a4e001c3ec
|
[Y] R service 加密参数
|
5 years ago |
|
liuxinxin
|
7e613dffde
|
[R] R Services fix
|
5 years ago |
|
taylor.dang
|
5de1d2f67f
|
Merge branch 'develop'
|
5 years ago |
|
taylor.dang
|
e173e25dcf
|
[Y] R service 加密参数格式
|
5 years ago |
|
taylor.dang
|
d82a37079c
|
Merge branch 'develop'
# Conflicts:
# pom.xml
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
5 years ago |
|
taylor.dang
|
9ac244038a
|
[Y] R service 加密参数
|
5 years ago |
|
duLingLing
|
57783d16d2
|
Upd:商户端清算文件，交易流水清算文件，变更显示数据类型样式
|
5 years ago |
|
duLingLing
|
3b46cf5926
|
Upd:商户端清算文件，交易流水清算文件，变更显示数据类型样式
|
5 years ago |
|
duLingLing
|
bb94be2a28
|
Upd:还原代码
|
5 years ago |
|
duLingLing
|
5c6e1c1b9c
|
Upd:还原代码
|
5 years ago |
|
duLingLing
|
080075698a
|
Upd:修复App用户退出后依然会接收推送消息问题
|
5 years ago |
|
duLingLing
|
6f34f16ff6
|
Upd:修改提供Geekpayment-API返回字段名称
|
5 years ago |
|
duLingLing
|
1c46248092
|
Add:对极客商服提供查询商户详情API
|
5 years ago |
|
duLingLing
|
881ba7f0c0
|
Add:对极客商服提供查询商户详情API
|
5 years ago |
|
duLingLing
|
8eacb056dc
|
Upd:修复App用户退出后依然会接收推送消息问题
|
5 years ago |
|
duLingLing
|
136ff975a6
|
Upd:修改提供Geekpayment-API返回字段名称
|
5 years ago |
|
duLingLing
|
5a6d97e0af
|
Add:对极客商服提供查询商户详情API
|
5 years ago |
|
duLingLing
|
f5b6fe34ff
|
Add:对极客商服提供查询商户详情API
|
5 years ago |
|
duLingLing
|
fa7cad96c6
|
Upd：修復交易排名數據五刷新
|
5 years ago |
|
duLingLing
|
c40c0425c4
|
Upd:日报表KPI修改BD团队数量统计，由统计原领队商户量，更改为统计团队商户量
|
5 years ago |
|
duLingLing
|
ca6b6dbe24
|
Upd：修復交易排名數據五刷新
|
5 years ago |
|
duLingLing
|
178532831d
|
Upd:日报表KPI修改BD团队数量统计，由统计原领队商户量，更改为统计团队商户量
|
5 years ago |
|
duLingLing
|
210868316f
|
Upd:修改RService未开通渠道显示判断
|
5 years ago |
|
duLingLing
|
a50dbd66a9
|
Upd:修改RService未开通渠道显示判断
|
5 years ago |
|
duLingLing
|
ba77702499
|
Upd:注释易宝相关代码
|
5 years ago |
|
duLingLing
|
d635f9489f
|
Upd:修改RService无图片替换图片
|
5 years ago |
|
duLingLing
|
9dd67049ee
|
Upd:注释易宝相关代码
|
5 years ago |
|
duLingLing
|
c3b505e8f9
|
Upd:修改RService无图片替换图片
|
5 years ago |
|
luoyang
|
7b47c9f3e7
|
fix docs
|
5 years ago |
|
luoyang
|
e152d7391e
|
fix docs
|
5 years ago |
|
luoyang
|
9a4885c26c
|
fix docs
|
5 years ago |
|
luoyang
|
3279090bfb
|
fix docs
|
5 years ago |
|
luoyang
|
744ef0eb01
|
fix docs
|
5 years ago |
|
luoyang
|
37cacde5c9
|
add docs incremental
|
5 years ago |
|
luoyang
|
587d10dfdd
|
add docs incremental
|
5 years ago |
|
luoyang
|
99da255250
|
add docs incremental
|
5 years ago |
|
duLingLing
|
e9b43bfa00
|
Upd:完善清算导出清算汇总Excel
|
5 years ago |
|
duLingLing
|
df176bff3d
|
Add:清算增加导出信息,父商户包含子商户时,导出多张sheet
|
5 years ago |
|
duLingLing
|
7bae858219
|
Upd:完善清算导出清算汇总Excel
|
5 years ago |
|
liuxinxin
|
9a5ce125a2
|
[R] R Services fix
|
5 years ago |
|
duLingLing
|
5cf5935f06
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
5 years ago |
|
duLingLing
|
cb9be3d7ef
|
Add:清算增加导出信息,父商户包含子商户时,导出多张sheet
|
5 years ago |
|
liuxinxin
|
d772ce912f
|
【R】R Service fix
|
5 years ago |
|
luoyang
|
1e6512fc25
|
Merge branch 'develop'
# Conflicts:
# pom.xml
|
5 years ago |
|
luoyang
|
36c6d99d84
|
Merge branch 'devlop-T1125-R-Rervice' into develop
|
5 years ago |
|
luoyang
|
81f7c0d10c
|
fix incremental rate
|
5 years ago |
|
duLingLing
|
bf4b32545b
|
Upd:添加缺损注释
|
5 years ago |
|
duLingLing
|
7a124c015c
|
Upd:修改排版
|
5 years ago |
|
duLingLing
|
9372017ff8
|
Upd:RService-LOGO修改布局
|
5 years ago |
|
liuxinxin
|
210d064495
|
[R] R Services fix
|
5 years ago |
|
liuxinxin
|
b51a9760ef
|
[R] R Services fix
|
5 years ago |
|
luoyang
|
642adc007f
|
fix ui
|
5 years ago |
|
duLingLing
|
dd4635e55d
|
Upd:修復RService详情页刷新丢失数据问题
|
5 years ago |
|
duLingLing
|
e997842879
|
Upd:修復RService详情页刷新丢失数据问题
|
5 years ago |
|
liuxinxin
|
caeae03bbf
|
【R】商户端&运营端订单source处理 fix
|
5 years ago |
|
luoyang
|
0f35761f6b
|
fix ui
|
5 years ago |
|
duLingLing
|
15dacce32f
|
Upd:交易流水查看timezone空指针异常处理
|
5 years ago |
|
duLingLing
|
f72ab6e8d5
|
Upd:交易流水查看timezone空指针异常处理
|
5 years ago |
|
luoyang
|
9476f376a1
|
fix ui
|
5 years ago |
|
liuxinxin
|
dee6c95a51
|
Merge remote-tracking branch 'origin/devlop-T1125-R-Rervice' into devlop-T1125-R-Rervice
|
5 years ago |
|
liuxinxin
|
a1da428d56
|
【R】商户端&运营端订单source处理 fix
|
5 years ago |
|
duLingLing
|
e5950e81e2
|
Upd:调整R Service 管理页面样式
|
5 years ago |
|
liuxinxin
|
8c70b3fc87
|
【R】商户端&运营端订单source处理 fix
|
5 years ago |
|
duLingLing
|
0d4311a7e0
|
Upd:商户端WEB，APP查询数据异常
|
5 years ago |
|
duLingLing
|
459fe61173
|
Upd:商户端WEB，APP查询数据异常修复
|
5 years ago |
|
duLingLing
|
63f12caff6
|
Upd:商户端WEB，APP查询数据异常
|
5 years ago |
|
duLingLing
|
451310fc22
|
Upd:商户端WEB，APP查询数据异常修复
|
5 years ago |
|
liuxinxin
|
1054f018b0
|
【R】商户端&运营端订单source处理
|
5 years ago |
|
duLingLing
|
97b4d409da
|
Upd:交易流水查看条件-日期无进行时区转换问题
|
5 years ago |
|
duLingLing
|
a8f659549c
|
Upd:交易流水查看条件-日期无进行时区转换问题
|
5 years ago |
|
duLingLing
|
fc572ca7d6
|
Upd:App查看交易流水汇总异常处理
|
5 years ago |
|
duLingLing
|
f7c049a2d6
|
Upd:App查看交易流水汇总异常处理
|
5 years ago |
|
duLingLing
|
29873c5006
|
修改商户端增值服务列表样式
|
5 years ago |
|
duLingLing
|
4da2eb338a
|
Upd:添加显示条件，根据条件显示不同布局
|
5 years ago |
|
duLingLing
|
0e4901bfb3
|
Upd:商户端增值渠道信息查看
|
5 years ago |
|
duLingLing
|
3b8cfdbea5
|
Merge branch 'develop_T1140' of https://pms.globalfreepay.com/source/royalpay.manage into devlop-T1125-R-Rervice
|
5 years ago |
|
liuxinxin
|
fbf83fcb35
|
【R】商户端&运营端订单source处理
|
5 years ago |
|
duLingLing
|
efc63cc373
|
R-service
|
5 years ago |
|
luoyang
|
d6074bc055
|
fix source_agree_file 排序问题
|
5 years ago |
|
luoyang
|
3b5cd5f1d3
|
fix source_agree_file 排序问题
|
5 years ago |
|
luoyang
|
efe494d50b
|
Merge branch 'develop'
|
5 years ago |
|
duLingLing
|
79bff22757
|
Upd:添加Gateway子分类
|
5 years ago |
|
duLingLing
|
f4834125cc
|
Upd:添加Gateway子分类
|
5 years ago |
|
yixian
|
f85e3e5334
|
documents update
|
5 years ago |
