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 |
|
duLingLing
|
214195b24d
|
UPD:修复商户-用户账号绑定异常问题
|
5 years ago |
|
duLingLing
|
06561d3c67
|
UPD:修复商户-用户账号绑定异常问题
|
5 years ago |
|
duLingLing
|
f2ecb8a575
|
UPD:修复商户-用户账号绑定异常问题
|
5 years ago |
|
duLingLing
|
f31d50c1e6
|
UPD:修复商户-用户账号绑定异常问题
|
5 years ago |
|
duLingLing
|
e2db33a062
|
Upd:修复管理端微信绑定查询已绑定用户报错问题
|
5 years ago |
|
duLingLing
|
5ba4873bfa
|
Upd:修复管理端微信绑定查询已绑定用户报错问题
|
5 years ago |
|
liuxinxin
|
ded82ea5d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
8a363e3ed6
|
【R】签订合同弹窗fix
|
5 years ago |
|
luoyang
|
2212a02829
|
fix 商户手机号 size>0
|
5 years ago |
|
luoyang
|
f181875f1a
|
fix 商户手机号 size>0
|
5 years ago |
|
liuxinxin
|
a637713283
|
【R】广告位屏蔽同行业商户 fix
|
5 years ago |
|
liuxinxin
|
78ddd81bbc
|
【R】广告位屏蔽同行业商户 fix
|
5 years ago |
|
liuxinxin
|
568f58d151
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
liuxinxin
|
13cec9138a
|
【R】广告位屏蔽同行业商户
|
5 years ago |
|
liuxinxin
|
a7463fa4cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
liuxinxin
|
64ea8a5d62
|
【R】广告位屏蔽同行业商户
|
5 years ago |
|
luoyang
|
f960c88200
|
fix customer_surcharge_rate 未通过也可以设置
|
5 years ago |
|
luoyang
|
794e637559
|
fix customer_surcharge_rate 未通过也可以设置
|
5 years ago |
|
luoyang
|
059c9f8917
|
fix findAccountByPhone
|
5 years ago |
|
luoyang
|
e3211c89fa
|
fix findAccountByPhone
|
5 years ago |
|
luoyang
|
3363146993
|
fix findAccountByPhone查到多条记录
|
5 years ago |
|
luoyang
|
3e9d5827f4
|
fix findAccountByPhone查到多条记录
|
5 years ago |
|
luoyang
|
6006720ada
|
fix 恢复注释
|
5 years ago |
|
luoyang
|
bdba35af67
|
fix 恢复注释
|
5 years ago |
|
luoyang
|
74e5e483cc
|
fix 恢复注释
|
5 years ago |
|
duLingLing
|
0bf127aa81
|
UPD:修改微信确定绑定，优先校验用户名密码
|
5 years ago |
|
duLingLing
|
1a304a9fd5
|
UPD:修改微信确定绑定，优先校验用户名密码
|
5 years ago |
|
duLingLing
|
c2cd43de4f
|
刪除ip限定
|
5 years ago |
|
duLingLing
|
ac6f9877e1
|
刪除ip限定
|
5 years ago |
|
luoyang
|
5a03d736ac
|
fix 自助进件支付宝关闭自动报备
|
5 years ago |
|
luoyang
|
acca378070
|
add phone验证码输出、注释报错
|
5 years ago |
|
luoyang
|
90d5ba0bc4
|
add phone验证码输出、注释报错
|
5 years ago |
|
luoyang
|
b533845741
|
add 自助进件调整
|
5 years ago |
|
luoyang
|
0db2b3a576
|
add 自助进件调整
|
5 years ago |
|
duLingLing
|
bec879cf56
|
个人设置新增接收解绑发送验证码接口
|
5 years ago |
|
duLingLing
|
4fd9de60e8
|
个人设置新增接收解绑发送验证码接口
|
5 years ago |
|
duLingLing
|
ea57a16d9a
|
个人设置新增接收解绑发送验证码接口
|
5 years ago |
|
duLingLing
|
5a1dec2a47
|
个人设置新增接收解绑发送验证码接口
|
5 years ago |
|
duLingLing
|
e028ec8a6d
|
Upd:修改个人设置短信验证码发送接口
|
5 years ago |
|
duLingLing
|
5315d8ddbc
|
Upd:修改个人设置短信验证码发送接口
|
5 years ago |
|
duLingLing
|
671f143d28
|
Upd:修改错误名称
|
5 years ago |
|
duLingLing
|
13df0df1c1
|
Upd:修改错误名称
|
5 years ago |
|
luoyang
|
6260572efc
|
fix 微信子商户号申请
|
5 years ago |
|
luoyang
|
d5c4713323
|
fix 微信子商户号申请store_name
|
5 years ago |
|
yixian
|
4df8c788c3
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
yixian
|
05c485b4d5
|
serverless trigger, add loggers
|
5 years ago |
|
luoyang
|
209fc9454c
|
fix merchant_application.js
|
5 years ago |
|
liuxinxin
|
406f01ea3b
|
【R】自助进件业务接口开发fix
|
5 years ago |
|
luoyang
|
bfeeb11ad9
|
fix merchant_application.js
|
5 years ago |
|
luoyang
|
5c72ef4a71
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
# src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
# src/main/resources/templates/app/app_customer.html
# src/main/ui/static/payment/partner/partner.js
|
5 years ago |
|
yixian
|
9f389e322e
|
serverless trigger
|
5 years ago |
|
luoyang
|
082a9d2d31
|
add 自助进件调整
|
5 years ago |
|
luoyang
|
38d959e20c
|
Merge branch 'develop_T1068_client_apply' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
# src/main/resources/application.properties
# src/main/ui/static/payment/partner/partner.js
|
5 years ago |
|
luoyang
|
306c4b0ecc
|
fix 自助优化
|
5 years ago |
|
liuxinxin
|
8e12972f89
|
【R】自助进件业务接口开发
|
5 years ago |
|
luoyang
|
d47d99fccc
|
fix sms手机短信开通后实现位置
|
5 years ago |
|
liuxinxin
|
b980d5f3f5
|
【R】自助进件业务接口开发
|
5 years ago |
|
liuxinxin
|
32c0d229cd
|
【R】自助进件业务接口开发
|
5 years ago |
|
luoyang
|
8ed8bef8f6
|
Merge remote-tracking branch 'origin/develop_T1068_client_apply' into develop_T1068_client_apply
|
5 years ago |
|
luoyang
|
cde203a969
|
fix 自助进件优化
|
5 years ago |
|
liuxinxin
|
b6cff2105c
|
【R】自助进件业务接口开发
|
5 years ago |
|
luoyang
|
3546e8e3b7
|
fix 自助进件优化
|
5 years ago |
|
luoyang
|
bd6e58ee3b
|
add app自助进件优化
|
5 years ago |
|
luoyang
|
231e19ea2f
|
fix pom
|
5 years ago |
|
luoyang
|
83dd33ad1c
|
fix 图片下载按钮
|
5 years ago |
|
luoyang
|
4becf70a4e
|
add 图片下载按钮
|
5 years ago |
|
luoyang
|
af404dc761
|
add 图片下载按钮
|
5 years ago |
|
luoyang
|
515fc8ca91
|
add 自助进件优化
|
5 years ago |
|
duLingLing
|
af87ad4209
|
TradeLogs 添加商户数统计修改显示图标
|
5 years ago |
|
duLingLing
|
bce2dae124
|
TradeLogs 添加商户数统计修改显示图标
|
5 years ago |
|
duLingLing
|
0aaf0ddda7
|
TradeLogs 添加商户数统计修改显示图标
|
5 years ago |
|
duLingLing
|
7501bbbd2c
|
TradeLogs 添加商户数统计修改显示图标
|
5 years ago |
|
duLingLing
|
d6b152a933
|
TradeLogs 添加商户数统计
|
5 years ago |
|
duLingLing
|
5c7d632ffb
|
TradeLogs 添加商户数统计
|
5 years ago |
|
liuxinxin
|
e27155f776
|
【R】自助进件业务接口开发
|
5 years ago |
|
luoyang
|
29283b0066
|
fix App时区
|
5 years ago |
|
luoyang
|
b6b2c25154
|
fix App时区
|
5 years ago |
|
luoyang
|
d039c30937
|
fix App时区
|
5 years ago |
|
luoyang
|
626ec917d5
|
fix App时区
|
5 years ago |
|
luoyang
|
4b1939fb9f
|
fix App时区
|
5 years ago |
|
liuxinxin
|
6876bf752b
|
【R】自助进件业务接口开发
|
5 years ago |
|
liuxinxin
|
9cb5da5816
|
【R】自助进件业务接口开发
|
5 years ago |
|
luoyang
|
c839f31b97
|
fix app夏令时
|
5 years ago |
|
luoyang
|
3398abeb43
|
fix app夏令时
|
5 years ago |
|
luoyang
|
ef764cc2f8
|
add 广告位屏蔽同行业 1.2.47
|
5 years ago |
|
luoyang
|
43d25157a5
|
Merge remote-tracking branch 'origin/master'
|
5 years ago |
|
luoyang
|
ca0dc31a47
|
fix app时区
|
5 years ago |
|
liuxinxin
|
67d08d28c4
|
【R】广告位屏蔽同行业商户
|
5 years ago |
|
liuxinxin
|
f228d3acc3
|
【R】广告位屏蔽同行业商户
|
5 years ago |
|
luoyang
|
9e11d4d2d8
|
fix app时区
|
5 years ago |
|
luoyang
|
89091ae461
|
fix app时区
|
5 years ago |
|
yixian
|
f544aba171
|
cache details
|
5 years ago |
|
duLingLing
|
79d207bbdd
|
Upd删除多余代码
|
5 years ago |
|
yixian
|
850090b0be
|
add logger for RetailAppMessage sender api
|
5 years ago |
