4213 Commits (2ceccc56da71fb524e312a1607e8d51af3df9123)

Author SHA1 Message Date
yixian 7f2ce325da update cardpay ui
5 years ago
yixian 4f1f292f08 update cardpay ui
5 years ago
yixian 0aa4843387 update cardpay ui
5 years ago
yixian 1dca324d35 update cardpay ui
5 years ago
yixian 0a0064b53e update cardpay ui
5 years ago
yixian dc342ced84 js update
5 years ago
yixian 2713b90c13 js update
5 years ago
luoyang 545be6818f fix merge
5 years ago
yixian dd5f00ec69 build: 2.1.2 rpaysvc
5 years ago
yixian f426f8c354 build: 2.1.1 integration
5 years ago
yixian 856eecac74 Merge branch 'develop-2.0' into develop
5 years ago
luoyang f1b9f8d9be add rservice app notify
5 years ago
luoyang 372a4346bb add rservice app notify
5 years ago
luoyang f85aec853c add 更新最新合同模版
5 years ago
luoyang 9f7318c3b5 fix rate display
5 years ago
luoyang f0ca9373d2 fix incremental rate display
5 years ago
luoyang aef3a80bba add 推送通知test
5 years ago
luoyang b80d3e8f0f fix incremental surcharge rate
5 years ago
luoyang e32ff20b40 add 增值服务交易流水
5 years ago
luoyang 65e5378d1c fix transaction 时间选择
5 years ago
dulingling 917eadf0f1 Upd:修复部分商户下载文件无法查看订单备注问题
5 years ago
dulingling d8655ef3e6 Upd:商户的ext_params在商户支付配置中做面板/
5 years ago
dulingling 6da96d24d7 Upd:商户的ext_params在商户支付配置中做面板/
5 years ago
luoyang a3c6d37a0a fix risk remark length
5 years ago
luoyang 866153a943 fix merge settle total surcharge
5 years ago
luoyang eaaefc6334 fix pom.xml
5 years ago
luoyang 08328d4370 add ap清算文件 报表增加商户编码和简称
5 years ago
luoyang 529be0e353 fix 清算日报时间误差
5 years ago
luoyang d871253368 add 支持合并清算报表下载查看、退款增加弹窗
5 years ago
luoyang ce9582ea52 fix h5 redirect url encode
5 years ago
luoyang 1a3fa95ddd add 手动清算增加统计功能
5 years ago
taylor.dang 4997d6ff11 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
taylor.dang 697c687c22 [Y] h5网关
5 years ago
luoyang c3e81c06e7 优化gateway 上传文件报错
5 years ago
luoyang d2e61ea9df add 商户欠款列表分类
5 years ago
luoyang 3f613fd797 fix 商户类别交易趋势统计 旅游出行
5 years ago
yixian bfc88976a7 build: ui docker
5 years ago
luoyang dbdbdc91bf fix 优化商户新增增值服务
5 years ago
luoyang bc4f598a36 fix 优化商户新增增值服务
5 years ago
luoyang c65b6a257d fix 优化商户新增增值服务,增加新增付费debit
5 years ago
luoyang 698ec55577 fix echarts partner为false加1情况
5 years ago
luoyang b20384f400 fix search date range
5 years ago
luoyang 57e46bc170 add 商户类别交易趋势增加交易商户数数据
5 years ago
luoyang a3b43675af add 商户类别交易趋势增加百分比
5 years ago
luoyang b76f334637 fix 服务文件上传大小
5 years ago
taylor.dang 4413caa142 apidoc
5 years ago
luoyang 1166a67189 fix 通知图片大小问题
5 years ago
luoyang d160dd54f5 fix 商户分类统计
5 years ago
luoyang a1465a7a3b fix 商户分类统计
5 years ago
luoyang 8b45824440 fix 微信商户行业
5 years ago
luoyang 2507d4b332 add 合规跳转商户端
5 years ago
luoyang c403863648 add RP商户类别交易统计
5 years ago
luoyang fd0b6c3e1d fix gwt2 partner error
5 years ago
luoyang c981e127d2 fix 商户端transaction查询记录
5 years ago
luoyang ddedffa17f fix 商户端transaction默认查询当天记录
5 years ago
luoyang 8a45a4fffc fix 商户端transaction查询记录
5 years ago
luoyang d24c861d37 fix royalpay 完善行业信息
5 years ago
luoyang 4522cce652 fix partners industry改为royalpay行业
5 years ago
luoyang a4111e1fd4 fix 开通邮件、子商户chose改为more
5 years ago
luoyang 937ab0b05a fix customer_surcharge_Rate max 3%
5 years ago
dulingling a827171295 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
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 6efe8ce301 add 商户自定义配置 hide_mch_device 隐藏设备
5 years ago
luoyang 674ae4b1f8 fix 增加测试账号leoh
5 years ago
luoyang 4ea0eafdff add partner tarde clientMoniker shortName
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 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 2b921b92c3 Upd:添加指定商户消费者数据重生接口
5 years ago
dulingling b19d14ab7a Upd:添加指定商户消费者数据重生接口
5 years ago
dulingling 482bb9721d Upd:修改计算新老消费者人头数,每日数据生成逻辑
5 years ago
luoyang 5fb3e409da add shortname rsvc
5 years ago
luoyang 1e28b924ec fix 跨境商城app 测试
5 years ago
luoyang 381e26453c fix 跨境商城优化、gateway进件优化
5 years ago
luoyang 8bec790b96 add rsvc返回CompanyName
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 1df4b4b0a9 fix 优化商户增加营销联系人
5 years ago
luoyang 3f123eee41 add App 弹窗黑名单功能
5 years ago
luoyang 7575fb56b9 delete app not found test
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 85e0ae4a50 fix app boolean int
5 years ago
luoyang 370ea700ea fix app boolean int
5 years ago
luoyang 1088e2bbdc fix app 弹窗次数
5 years ago
luoyang 90aeded68c fix 跨境商城修改
5 years ago
luoyang 3cc9623569 fix 跨境商城修改
5 years ago
luoyang e32493f654 add 跨境商城RP付费扣款 增加扣款订单
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 140fe334ee fix geek act
5 years ago
liuxinxin 1193f70c05 【R】商户Invoice接口
5 years ago
luoyang 74d0ca7365 fix pom.xml
5 years ago
luoyang e26490808b fix 模糊查询
5 years ago
luoyang 72ff8eb390 add 弹窗+banner增加版本检测、商户端增加商户订单id、平台订单模糊查询、交易流水增加search框
5 years ago
luoyang e69c031067 fix 活动页新增枚举popup
5 years ago
luoyang 42e03548dd fix 活动页新增枚举popup
5 years ago
luoyang f4201385da fix 跨境商城使用详情页面
5 years ago
luoyang c735bc500f fix 跨境商城使用详情页面
5 years ago
luoyang 963dbc7040 add 开店状态通知、app扫码接口增加source参数
5 years ago
luoyang 20200198c8 add app弹窗运营修改
5 years ago
luoyang a31f127c26 add App扫码同时单点登录跨境商城
5 years ago
luoyang ff5a3cbc46 fix 商服弹窗只针对pine开放
5 years ago
taylor.dang 1155160248 AP进件
5 years ago
luoyang fb436d375a fix transflow pdf clientIds
5 years ago
luoyang 0c7afb545c fix transflow clientIds
5 years ago
luoyang b53dbf98dc add 单点登录、app通用弹窗接口
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 4da54d7219 fix 跨境商城扣款接口
5 years ago
dulingling 96b5139d97 Upd:运营端用户数据分析增加金额于订单量删选排序
5 years ago
luoyang 2d8fdaece4 fix maven cache
5 years ago
luoyang 3342b331e5 fix rServer listen
5 years ago
luoyang 4fabe349cd fix summary下载20条问题
5 years ago
luoyang 4bb094afa0 fix summary下载20条问题
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 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 33723c228c fix controller org
5 years ago
luoyang ac20d64c6a fix dev controller class
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 5b1bb5d48c remove redpack mp
5 years ago
luoyang 246ef08ab8 1.3.24 增加surcharge_rate 字段,后续未调整
5 years ago
taylor.dang 0582321556 [Y] 新增禁止查询level3商户开关
5 years ago
yixian d19bc70a16 presettle undo processing
5 years ago
dulingling 073df7b0ee Upd:客户订单交易数据修改为无交易也显示日期
5 years ago
taylor.dang 86a754451c remove alipay loginid
5 years ago
taylor.dang 05e57f0592 update
5 years ago
liuxinxin 21d7513222 [R] fix
5 years ago
liuxinxin 947609278d [R] 开发工具 查询报关情况
5 years ago
luoyang 2d47d888b3 fix order source
5 years ago
luoyang 1fe36f7429 fix order source
5 years ago
luoyang 4ac279ebac fix divers修复
5 years ago
luoyang ee1e41f66b add kyc update
5 years ago
luoyang 9da043de5c add 清算表格增加dev remark
5 years ago
liuxinxin bc49f7667d [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 b2e5392b69 fix BD prize bug
5 years ago
liuxinxin 83f089979c [R] fix
5 years ago
luoyang 6d36bd329c 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 cc383d474b [R] APP端接口调整
5 years ago
dulingling 0404b35b1f Add:添加支付宝支付页面
5 years ago
yixian 5ea3a11d87 app message sending api update
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 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
yixian 4c975e8485 csv charset fix
5 years ago
yixian 3b6db8dff5 ui update
5 years ago
yixian 50f92d69cb export csv
5 years ago
liuxinxin b35e33fc0a [R] APP端接口调整
5 years ago
luoyang 87e686c1b5 fix kyc notify
5 years ago
luoyang fa7e289d51 fix wx notify
5 years ago
luoyang 8b02624f62 Merge branch 'develop_T1249' into develop
5 years ago
luoyang 362c081020 add 内部测试
5 years ago
duLingLing c71b44eef4 Add:新增微信支付页面
5 years ago
luoyang 71b80bae57 fix wx notify
5 years ago
luoyang 5dbfe62631 fix rservice apply notify i18n
5 years ago
luoyang 81ef18360a fix rservice apply
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 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 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 bcafcdcb29 Upd:服务提供spms读取数据结构查询条件
5 years ago
liuxinxin 0b7616f212 [R]KCY认证Web端开发
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
yixian e2ba914c1c Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 24f3a628cd documents update
5 years ago
duLingLing ddb9f1a8d2 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago