3198 Commits (8ab0b4f67fbdc7e9265c2f80e74b2e128042c153)

Author SHA1 Message Date
yangkai d577e12796 Merge branch 'develop'
6 years ago
luoyang c0d7c20fe2 add alipay 报备
6 years ago
yixian b8d2303443 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 59ee2a617a auto refresh captcha
6 years ago
yangkai 6041f97e02 bd可以查看、下载自己的提成详情
6 years ago
luoyang e3016f1025 Merge remote-tracking branch 'origin/master'
6 years ago
luoyang 2ac7c7acec fix 过滤掉合伙人BD
6 years ago
yixian 1c82e7397b Merge branch 'hotfix_send_editable_logs_only' into develop
6 years ago
yixian be4ee2a735 fix small warning
6 years ago
luoyang b948b326d5 fix Estimate
6 years ago
luoyang 7ca7c0b3c9 fix Estimate
6 years ago
luoyang 589977b2d8 fix Estimate
6 years ago
luoyang b4da9ca173 fix Estimate
6 years ago
luoyang 35202a83de fix Estimate
6 years ago
luoyang 7ff7ad8058 revert
6 years ago
luoyang 3c18b97142 tmp 测试remask 弹窗浮动
6 years ago
luoyang 3df9dcfe2c fix
6 years ago
luoyang a23ea19136 fix
6 years ago
luoyang 4754d0b844 add transaction pos 条件
6 years ago
luoyang 8db360ec4d Merge remote-tracking branch 'origin/master'
6 years ago
luoyang 8847a3af53 add transaction pos设备筛选条件
6 years ago
james.zhao 2aaca574cd Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 6c48a15615 清算校验异常抛出
6 years ago
james.zhao 0d3a353e59 Merge branch 'develop'
6 years ago
james.zhao 8cf08d0026 alipay_online清算验证费率调整
6 years ago
luoyang fda28110b0 fix 清算验证 分页
6 years ago
luoyang b982336f76 fix 清算验证 分页
6 years ago
james.zhao b4ecfe8f15 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao d71faf795d yeepay apply&update
6 years ago
james.zhao 7c0f7cf4f6 yeepay sub update
6 years ago
james.zhao 224ea3c64f Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao 0f6e1c550f yeepay sub update
6 years ago
luoyang 8d3605bf07 fix 过滤掉未开启微信支付的商户
6 years ago
luoyang 8e0ef8cdbc fix 删除测试方法
6 years ago
luoyang 9c5b1eb6a4 fix
6 years ago
luoyang 3c807a4050 add 测试商户重置密码微信推送 & tmpSend
6 years ago
lujian 2dde2116c7 [fix]风控内部调单添加密送邮箱
6 years ago
lujian 0b909d47ba [fix]
6 years ago
yixian 7be4235424 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 599c6f7b07 fix small warning
6 years ago
james.zhao ebf434c161 Merge branch 'develop'
6 years ago
luoyang 0da6e5f902 fix 过滤掉未开启微信支付的商户
6 years ago
james.zhao e42d6d03ba Customs update
6 years ago
luoyang 0da58ea321 fix 过滤掉未开启微信支付的商户
6 years ago
james.zhao eb0fa66c66 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 00eabd51aa fix
6 years ago
james.zhao b539b0ca47 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 170677d696 api update
6 years ago
james.zhao f7560131a4 Merge branch 'develop'
6 years ago
james.zhao 247a20d4fd 商户端报关页面
6 years ago
james.zhao 2a0ef3b23b 报关接口API
6 years ago
james.zhao 58cdd3d1cc Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao e2a21cf050 update
6 years ago
james.zhao 5ca7c08b94 CB BankPay Api
6 years ago
luoyang 8514460a5f fix 15 50
6 years ago
taylor.dang 6e3309768e Merge branch 'develop'
6 years ago
yixian de10b4f846 attach sign params into redirection
6 years ago
luoyang 8d64f75ff5 fix 修改合同细节 && 2015-2019版权信息
6 years ago
james.zhao 70c18eda67 Merge remote-tracking branch 'origin/develop'
6 years ago
luoyang b6fcdda787 fix 修改合同细节 && 2015-2019版权信息
6 years ago
james.zhao 644d112b94 支付宝进件
6 years ago
luoyang ec70b21294 fix 修改合同细节 && 2015-2019版权信息
6 years ago
lujian 12181a46ba [fix]
6 years ago
lujian 1e49ee0b9e [fix]
6 years ago
lujian afe41aa77b [fix]
6 years ago
hellolujian 554da463bd [fix]
6 years ago
hellolujian af936510c3 [fix]
6 years ago
james.zhao 7118cb25c5 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 8c207e5e97 update
6 years ago
taylor.dang 8e109ad2e3 支付宝进件接口
6 years ago
james.zhao 222edd7430 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao b23ad3d782 补发红包
6 years ago
james.zhao 84a8773325 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 47ddb3e3d9 update
6 years ago
james.zhao 84a8fe9d31 update
6 years ago
james.zhao fb89c08f95 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 887e3e2268 update
6 years ago
james.zhao ba79b580b0 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao cb99428bcc Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao 254fdd9bb7 春节拆红包init
6 years ago
lujian ebaf807d23 [fix]
6 years ago
lujian db148d036f [fix]wexin 解绑
6 years ago
yixian e576c675fd ui bug fix
6 years ago
yixian 6b6b26d540 ui bug fix
6 years ago
yixian 64b6779ff8 ui bug fix
6 years ago
yixian 375f0a3882 aba file remark from param outside
6 years ago
lujian 7dc090209c [fix]到账提醒通知页面
6 years ago
luoyang 335290dc01 fix org commission year
6 years ago
luoyang 48142e9f78 fix org commission year
6 years ago
luoyang 75d93b5b56 fix
6 years ago
luoyang f9f7bb15bd add app_style balance
6 years ago
luoyang e126326efa add app_style balance
6 years ago
yangkai 2a8feefb19 Merge branch 'develop'
6 years ago
yangkai b5287202ae fix
6 years ago
yangkai 6bf22dabe7 Merge branch 'develop'
6 years ago
yangkai 3ad1a84834 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai ede4ec78ad 交易流水详情导出优化
6 years ago
lujian 20c29056eb [fix]
6 years ago
lujian 4c7e643b59 [fix]
6 years ago
lujian 8e7c57344d [fix]
6 years ago
lujian 4328c7ef5f [fix]
6 years ago
lujian 210a8aab48 [fix]
6 years ago
lujian a10d9ce765 [fix]
6 years ago
lujian efea8fc17a Merge remote-tracking branch 'origin/develop' into develop
6 years ago
lujian 992037febc [fix]
6 years ago
lujian acd366b849 [fix]支付宝调单修改
6 years ago
lujian f45b0985ea [fix]
6 years ago
james.zhao 8181a98074 Merge branch 'develop'
6 years ago
james.zhao 3c5afc54f7 update
6 years ago
james.zhao 50ea4adff3 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao f24f75ca14 v3
6 years ago
yangkai c55232b23d alipay数据导出
6 years ago
lujian 9b210a224e [fix]
6 years ago
lujian e2a5e95b8f [fix]
6 years ago
lujian 560bf07c69 [fix]账单活动
6 years ago
yangkai 2eb65aa920 royalpay快捷网银通道-商户渠道切换
6 years ago
yangkai 4264a2bb75 支付通道交易列表添加交易商户数跟开通该渠道商户数
6 years ago
yangkai 516a5014dc fix导出商户交易流水详情
6 years ago
yangkai c40e0d8bb1 商户清算文件pdf导出
6 years ago
luoyang 280887a75e subpartner add store_name
6 years ago
luoyang 5f12f2fc94 subpartner add store_name
6 years ago
luoyang 8d85414086 fix
6 years ago
luoyang cc10219ebf store_name 必填
6 years ago
luoyang 5619d21469 store_name 必填
6 years ago
luoyang 32295102ce 增加合伙人提成定时任务
6 years ago
luoyang 070c2f7586 增加定时任务,每月一号0点15分生成合伙人提成
6 years ago
luoyang 8b306885bc temp 注释重复生成合伙人提成 限制
6 years ago
luoyang a0e2600382 增加 store_name 提醒
6 years ago
luoyang 8464e51c9f 增加 store_name提醒
6 years ago
luoyang 6824fda05d fix
6 years ago
luoyang a289abd2fa fix
6 years ago
taylor.dang e026399f05 remove clean remark
6 years ago
taylor.dang 98a04939bd remove clean remark
6 years ago
luoyang b42d17309b fix
6 years ago
luoyang 45deeca762 add store_name
6 years ago
luoyang 422891997a add store_name
6 years ago
luoyang 7f28b588f0 add store_name
6 years ago
luoyang 352efe1f7f add store_name
6 years ago
luoyang 94f0d3a134 add store_name
6 years ago
luoyang 404b3825a8 Merge remote-tracking branch 'origin/master'
6 years ago
luoyang 2272e5146b add store_name
6 years ago
yixian 444cc0427e pom ver
6 years ago
yixian b4544295a8 pom ver
6 years ago
yixian f6eff7bb2e secure file fix
6 years ago
yixian 1178b46859 secure file fix
6 years ago
luoyang d05a3f9522 fix cb_bankpay
6 years ago
luoyang 6bf626ba16 fix 合伙人提成支持CBBankPay
6 years ago
james.zhao 0eea9ee276 Merge remote-tracking branch 'origin/develop'
6 years ago
yixian 0f6267d783 secure file fix
6 years ago
james.zhao 0ac0b8bdbd Merge remote-tracking branch 'origin/develop'
6 years ago
yixian 223e9c708f Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian da629ca16b fix bug
6 years ago
james.zhao 314ca1b500 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
james.zhao d62ff090aa Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao b33f657e83 update
6 years ago
james.zhao 93d1075140 update
6 years ago
taylor.dang b14b693a26 hanyin
6 years ago
james.zhao 98a5852056 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao 85eb7fecf1 yeepay update
6 years ago
yixian 08f3d06e66 config key edit
6 years ago
yixian a4e62a3bb5 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 2e732bb770 secure upload manual api
6 years ago
yangkai 141389f712 Merge branch 'develop'
6 years ago
yangkai 7b7b7079fa 商户端清算详情批量导出
6 years ago
lujian 54fa46567a [fix]
6 years ago
lujian a76a1a4cf5 [fix]
6 years ago
lujian b928ef8dfe [fix]商户简称限制15字符
6 years ago
lujian 0897d2ddb2 [fix]商户简称限制15字符
6 years ago
yixian 4bb9cc96da secure upload
6 years ago
yixian bb5d6dbd25 secure upload
6 years ago
yixian e43b4b0f42 secure upload
6 years ago
james.zhao 3ac82ce0e3 update
6 years ago
james.zhao 2f3502b49d update
6 years ago
james.zhao 650e579f95 yeepay sub init
6 years ago
luoyang e2c20576e4 fix try_alerts & alerts display_amount
6 years ago
luoyang 67f73d7f7c fix try_alerts & alerts display_amount
6 years ago
luoyang e7037350e5 fix saveSubMerchantId refresh
6 years ago
luoyang e2f050450b fix saveSubMerchantId refresh
6 years ago
yangkai 22dfb16a14 Merge branch 'develop'
6 years ago
yangkai 7d8ec01b19 fix
6 years ago
james.zhao f4b11ffad6 立牌图片更新
6 years ago
yangkai 02efeb6f01 1.商户账号修改白名单
6 years ago
lujian 3fc305ac40 [fix]
6 years ago
james.zhao c5e2103bee Merge branch 'develop'
6 years ago
james.zhao d91961b6d2 fix bug
6 years ago
yangkai 6168190732 Merge branch 'develop'
6 years ago
yangkai 01e3e8e234 hold commission
6 years ago
yangkai c0194eeca9 Merge remote-tracking branch 'origin/master'
6 years ago
yangkai f324751ed6 Merge branch 'develop'
6 years ago
yangkai 2c1e895a57 cb_bankpay默认值
6 years ago
yangkai f530ac84df Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai 6b68f0c563 bd提成下载&bd提成查询优化
6 years ago
yangkai 504bac4041 Merge branch 'develop'
6 years ago
yangkai cde5094995 fix
6 years ago
yangkai 7b1464b547 注释组织管理中hf、yeepay
6 years ago
yangkai 67a6e7cb16 注释hf、yeepay
6 years ago
yangkai fb3e829301 Merge branch 'develop'
6 years ago
yangkai 28a74d89e5 注释rpay+费率信息
6 years ago
yangkai 4886dd214e fix
6 years ago
yangkai 1796a7fd3e fix
6 years ago
yangkai cbf474e01a cb_bankpay
6 years ago
taylor.dang d744e058c2 Merge remote-tracking branch 'origin/master'
6 years ago
taylor.dang 65fabf3253 Merge branch 'develop'
6 years ago
lujian a0b5557f99 [fix]支付成功页修改
6 years ago
lujian d3585149c6 [fix]支付成功页修改
6 years ago
yangkai fcd07f15a9 init coupon processors
6 years ago
james.zhao 9177b85bec Merge branch 'develop'
6 years ago
james.zhao 28ab73c425 fix bug
6 years ago
james.zhao fd7eddaf0f Merge branch 'develop'
6 years ago
james.zhao 543327f0ff 风控事件单增加禁用按钮
6 years ago
luoyang 0d50ab284c add 关闭清算输入原因
6 years ago
luoyang aed415d530 add 关闭清算输入原因
6 years ago
luoyang b7ce1b8924 add org_detail 商户/交易数据/提成 && 重构合伙人提成
6 years ago
luoyang 9b2b7a6619 Merge branch 'develop'
6 years ago
luoyang 1b60ddb959 add org_detail 商户/交易数据/提成
6 years ago
luoyang 8002da724c add org_detail 商户/交易数据/提成
6 years ago
luoyang 28742dae95 temp commit add org_detail 70%
6 years ago
luoyang 0a7979ae96 Revert "重构royalpay合伙人提成"
6 years ago
luoyang b3eeb2f723 Merge branch 'develop'
6 years ago
luoyang 2ef721ea08 重构royalpay合伙人提成
6 years ago
lujian 1dbd7dca0c [fix]风控上传页面
6 years ago
lujian 817e18e57a [fix]风控人员上传页面
6 years ago
taylor.dang e94ee7e764 Merge branch 'develop'
6 years ago
taylor.dang 716e0ceffb loading
6 years ago
taylor.dang 967ebc5de5 Merge branch 'develop'
6 years ago
luoyang 64bad6d11d add skip_clearing comfig
6 years ago
luoyang 3c0c2aa944 add
6 years ago
yixian 6fedebcf2f Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 7f07641d56 spell error
6 years ago
luoyang 56a9d2ff61 fix yeepay client_rate
6 years ago
luoyang 2a31151322 fix yeepay client_rate
6 years ago
luoyang 4539136699 fix
6 years ago
luoyang 3acb017546 add docs/wechat sdk doc
6 years ago
luoyang dfea838272 fix
6 years ago
luoyang adc00b6c1f add docs/wechat sdk
6 years ago
james.zhao 4fc3efd8dc Merge branch 'develop'
6 years ago
lujian c0db3b484a [fix]支付成功页样式微调整
6 years ago
taylor.dang 3a69c7a076 Merge branch 'develop'
6 years ago
taylor.dang 3f55c636a6 yeepay
6 years ago
lujian dbe47fbd67 [fix]注释支付成功页选项
6 years ago
james.zhao e33b0e6f85 Merge remote-tracking branch 'origin/develop'
6 years ago
lujian bff6bcdcb2 [fix]邮件英文
6 years ago
james.zhao 5ce3493760 Merge branch 'develop'
6 years ago
james.zhao a2ce6d0387 通知邮件用户名小写
6 years ago
james.zhao 9c5f01958a Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao f8f2d4b254 update
6 years ago
james.zhao cbda1599be Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao baa99631d1 info邮箱密码
6 years ago
lujian 5dd947a9db [fix]新增支付成功页
6 years ago
james.zhao 2b63577b34 风控调整log和e-charts
6 years ago
james.zhao d643f8cea7 风控 e-charts分析
6 years ago
james.zhao 799cc6da48 email update
6 years ago
lujian 50aae1323a [fix]重复提交
6 years ago
lujian 5a856b2f95 [fix]alipay材料动态显示
6 years ago
lujian 22bb45a1e7 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
lujian 8cd3940c7c [fix]风控处理流程显示
6 years ago
taylor.dang 7f86b075c6 ignore
6 years ago
yangkai 0c954ac7ac 商户退款预警白名单
6 years ago
james.zhao 9e762fe398 update
6 years ago
james.zhao 473aa0adf9 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao 3789d483c3 取消日期限制
6 years ago
lujian 333e496549 [fix]开放spms数据统计接口
6 years ago
james.zhao 5fd561a578 css update yeepay
6 years ago
lujian 03302dbdc5 [fix]excel添加设备名
6 years ago
yangkai 8ce96a7a83 消费者黑名单
6 years ago
yangkai 7f935392d4 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai e4bc549a60 绑定微信只显示一次
6 years ago
taylor.dang bbfcd63af5 通用商户号提醒
6 years ago
james.zhao 490618f3b9 Update
6 years ago
james.zhao bf281bd7d8 Update
6 years ago
james.zhao 56c0100abf Update
6 years ago
james.zhao a4cad9ca04 Update
6 years ago
james.zhao 5152b24816 风控邮件调整
6 years ago
yangkai 7a44fa30c4 通用子商户号使用数量
6 years ago
yangkai dda910806a Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai 87a3849227 绑定微信二维码提醒注释
6 years ago
lujian 7f2c6a99e8 [fix]
6 years ago
lujian d2a6c37489 update
6 years ago
lujian 56602e9b09 update
6 years ago
lujian 968c4848c5 update
6 years ago
lujian 86d26f51d0 [fix]添加拒绝说明
6 years ago
lujian 01e0c211ac update
6 years ago
lujian 43ad13ecea [fix]
6 years ago
lujian 0de5aa3780 update
6 years ago
lujian 2ae7a49d5f [fix]
6 years ago
lujian 7ac0a012d6 update
6 years ago
lujian 1b43e2ac4d [fix]是否发送商户、超期提醒
6 years ago
luoyang f885797ac4 fix estimate monday
6 years ago
luoyang ea403c5072 fix estimate monday
6 years ago
luoyang de3d3d7b3b add manage-provider
6 years ago
luoyang 3e814c663a fix estimate monday
6 years ago
james.zhao 8580e7e4ce Update
6 years ago
taylor.dang 0fe72800bd 风控模块
6 years ago
taylor.dang 87e956caba 风控模块
6 years ago
lujian 06d4c3a512 [fix]
6 years ago
lujian 4a563a148f [fix]
6 years ago
lujian 39d76ade6b [fix]
6 years ago
james.zhao ca864b4f0b update
6 years ago
james.zhao ed84c506f9 update app message
6 years ago
lujian 03bae40474 [fix]
6 years ago