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 |
|
yixian
|
fccea0db9c
|
export excel columns add settle date, settle amount, total surcharge, GST
|
5 years ago |
|
luoyang
|
3a50fc9dee
|
fix 客户支付手续费导致提成组织成本手续费高
|
5 years ago |
|
luoyang
|
f86483ce77
|
fix 客户支付手续费导致提成组织成本手续费高
|
5 years ago |
|
duLingLing
|
036b33ae03
|
Upd:登录识别字段由OpenId变更为unionId,微信不同平台相同识别字段为unionid
|
5 years ago |
|
duLingLing
|
d40b65ba6f
|
Upd:登录识别字段由OpenId变更为unionId,微信不同平台相同识别字段为unionid
|
5 years ago |
|
liuxinxin
|
9424535448
|
【R】自定义费率fix
|
5 years ago |
|
liuxinxin
|
87324141db
|
【R】自定义费率fix
|
5 years ago |
|
duLingLing
|
7547ba954b
|
Upd:添加新闻增加标题字段，该字段只针对news创建使用
|
5 years ago |
|
duLingLing
|
7f871d1aa4
|
Upd:添加新闻增加标题字段，该字段只针对news创建使用
|
5 years ago |
