2865 Commits (7ad3c813a003a5bed3526046de85b7d38ae0b2cd)

Author SHA1 Message Date
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
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
lujian 872d566449 [fix]
6 years ago
lujian bbc079e03f [fix]风控接口修改
6 years ago
lujian ab2242079c [fix]风控接口调整
6 years ago
james.zhao 0620d4e3ed Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao 7be33376ab Yeepay Order Dev
6 years ago
lujian 0322fc0570 [fix]风控对app端接口
6 years ago
james.zhao bd3aec323f alipay风控
6 years ago
lujian 7f16d92781 [fix]风控需求修改
6 years ago
lujian fd4c89fdbf [fix]风控需求修改
6 years ago
lujian 174064e245 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
lujian 285a436a91 [fix]风控需求修改
6 years ago
james.zhao 38da65cf72 Yeepay init
6 years ago
taylor.dang 4594faee58 Merge branch 'develop'
6 years ago
taylor.dang eae6ff652d 退款审核
6 years ago
taylor.dang 98a908a0b1 Merge branch 'develop'
6 years ago
taylor.dang 1383b71c69 fix
6 years ago
taylor.dang 380b3ba16f Merge branch 'develop'
6 years ago
taylor.dang b65f706555 cashier退款审核
6 years ago
taylor.dang a474349e88 Merge branch 'develop'
6 years ago
taylor.dang 578bb08fe5 修复cashier openid bug
6 years ago
taylor.dang ee1c7ac4cd Merge branch 'develop'
6 years ago
taylor.dang 62d2f90758 修复cashier退款审核流程失败,导致退款失败
6 years ago
taylor.dang fec38a1b07 Merge branch 'develop'
6 years ago
lujian 58e3183d40 [fix]修复通用号调单商户不存在的情况
6 years ago
luoyang f6b6e144d8 fix 商户活跃度&&消费者排名 sql优化
6 years ago
luoyang 05c5d7207a fix 商户活跃度&&消费者排名sql优化
6 years ago
luoyang 68a1942364 add && fix 商户号管理\优化SQL
6 years ago
luoyang c61eda605e add 风控中心增加商务号管理
6 years ago
luoyang 9b6f1e38dc fix mapper client_rates&&orderAnalysis
6 years ago
yixian ea8eeafb1d distribute bank rule edit: prefer to move no-CBA bank accounts to ANZ
6 years ago
taylor.dang f2104e2af5 Merge branch 'develop'
6 years ago
yixian 2787bfba7c Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian b6e7f93c4d settle page, download single settle batch files
6 years ago
taylor.dang f34c498522 修改邮件密码
6 years ago
james.zhao 23f6c6d5d9 Merge branch 'develop'
6 years ago
lujian b3ba95491b [fix]
6 years ago
james.zhao bc2b4db557 Merge branch 'develop'
6 years ago
james.zhao 637fe4a769 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao a18af881a5 控件显示
6 years ago
james.zhao d1ffa5216c Merge branch 'develop'
6 years ago
james.zhao a40ea34bad update
6 years ago
james.zhao bfb248a735 update
6 years ago
james.zhao 9c2c2222a1 update
6 years ago
james.zhao 9b9ee268e2 update
6 years ago
james.zhao 0a87573272 Merge branch 'develop'
6 years ago
lujian 6aeac6a5fe [fix]gateway显示修改
6 years ago
lujian 4268b28569 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
lujian 7370251a74 [fix]bd上传页面添加codekey
6 years ago
yangkai 5f17203352 Merge branch 'develop'
6 years ago
yangkai 58aed6224a 注释BD自主申请列表
6 years ago
lujian 36ac260230 [fix]风控最后一次上传,回家
6 years ago
james.zhao e84593be88 v2增加风控页面
6 years ago
lujian 6580254327 [fix]风控渠道处理结果改成select
6 years ago
yangkai f6b1354a78 Merge branch 'develop'
6 years ago
yangkai 433c6ebf8d bd添加商户自助申请
6 years ago
lujian b8265440ca [fix]bd页面
6 years ago
luoyang 98a301ba4a add compliance partnerList register_time
6 years ago
luoyang 88c55e0fc6 add compliance partnerList register_time
6 years ago
yangkai df3159e98a Merge branch 'develop'
6 years ago
yangkai 77fe420e83 BD提成列表添加财务权限
6 years ago
james.zhao 1ffbdc211c Merge branch 'develop'
6 years ago
james.zhao 9e0e2ca0c9 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao e80b79e194 风控业务
6 years ago
luoyang 44383df2ca fix guest
6 years ago
luoyang a8a1b2389f fix guest
6 years ago
luoyang 0776c9bfbe fix guest
6 years ago
luoyang c461d64dff fix guest
6 years ago
yangkai cfb7d39108 导航栏选项卡bug修改
6 years ago
luoyang 3d321c1178 fix guest
6 years ago
luoyang 749139c899 fix ja json
6 years ago
luoyang 303eccdff9 fix
6 years ago
james.zhao c1b5e90235 Merge branch 'develop_risk' into develop
6 years ago
james.zhao 9f9f5eb433 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
luoyang 32be2ae64d fix
6 years ago
luoyang fca560e90a add guest login
6 years ago
luoyang 26f18eebda add guest login
6 years ago
taylor.dang ffcf74b518 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
taylor.dang 267c2526d2 Merge branch 'develop'
6 years ago
luoyang 665a3f6f1a fix lastMonth
6 years ago
taylor.dang 108557b00c 清算预估
6 years ago
yixian 59259a6c25 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian b9d02da2cb 商户收取手续费提示
6 years ago
luoyang ffc9349ddf close bd_leader <- 清算日管理
6 years ago
luoyang afc74060ea add bd_leader <- clearing modules
6 years ago
luoyang 630844a3c1 add bd_leader <- clearing modules
6 years ago
luoyang 355ad56d02 add bd_leader <- clearing modules
6 years ago
lujian 5454ec2ac0 [fix]
6 years ago
james.zhao 33700aa64e Merge branch 'develop'
6 years ago
james.zhao b9224b75e4 update
6 years ago
james.zhao d106fb8fd4 Merge branch 'develop'
6 years ago
james.zhao c0480d2c62 update
6 years ago
james.zhao e491aa006a Merge branch 'develop'
6 years ago
james.zhao b8140db7e2 万圣节添加活动次数
6 years ago
james.zhao 39874142d9 Merge branch 'develop'
6 years ago
james.zhao 0bcbba9b23 万圣节添加活动次数
6 years ago
james.zhao f84bad16d0 Merge branch 'develop'
6 years ago
james.zhao c3ddf0e5d5 万圣节添加活动次数
6 years ago
james.zhao 4158922e7c 万圣节添加活动次数
6 years ago
james.zhao bb0f0a37a5 Merge branch 'develop'
6 years ago
james.zhao 4927d0998e 商户交易明细添加remark和gateway
6 years ago
luoyang 28d94d9a64 add clearManager
6 years ago
luoyang 992b9cec09 add clearManager
6 years ago
luoyang 297d01a794 fix manage.html & menu_html
6 years ago
luoyang c789897636 fix manage.html & menu_html
6 years ago
luoyang ad83527c06 Merge branch 'develop'
6 years ago
yangkai 172a891421 fix
6 years ago
yangkai 3e7a68c5b6 fix
6 years ago
yangkai f94c699284 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
luoyang c254ad6526 add main_menu icon
6 years ago
yangkai c2a383d60a functions ui修改
6 years ago
luoyang 56a5eb6aa5 fix main_menu
6 years ago
yangkai f1e11d178f fix
6 years ago
hellolujian 91d51e4629 [fix]
6 years ago
hellolujian 4ee68e191f [fix]
6 years ago
hellolujian 0bb5b651b0 [fix]获取halloween活动当天订单信息
6 years ago
james.zhao 403b31ef33 万圣节支付完成添加活动次数
6 years ago
yangkai 4780926f00 [fix]permissions
6 years ago
luoyang 8ae8685487 add permission function set role
6 years ago
luoyang 408e5d9a30 fix manager2 js
6 years ago
yangkai 59b80bd0b5 fix商户合规
6 years ago
luoyang 6255041194 fix compliance listpartners
6 years ago
yangkai 1e09f24b85 fix
6 years ago
luoyang 410d501cda fix managerv2 header select
6 years ago
yangkai 6390273384 fix
6 years ago
luoyang 005a33d84e fix check has role
6 years ago
taylor.dang 465c076027 dev
6 years ago
taylor.dang 7eaac2d93b 1
6 years ago
luoyang a9a74e58cf fix 领导决策加入合伙人管理
6 years ago
luoyang 88b7fd4d23 add 临时合同
6 years ago
luoyang 8496689ca0 add 临时合同
6 years ago
luoyang 971f0ca39a revert v1&v2-manager.html
6 years ago
luoyang 7e62aeb6b2 fix v1&v2-manager.html
6 years ago
luoyang 5c4e012148 fix v1&v2-manager.html
6 years ago
yangkai aa43765010 fix
6 years ago
luoyang d0ea610146 fix v2-manager.html one role
6 years ago
luoyang 648cba58ce Merge branch 'develop_newUI' into develop
6 years ago
yangkai 2787998961 fix
6 years ago
yangkai 43098e4550 fix
6 years ago
luoyang 21ce0b9d53 fix v2-manager.html header rolenow
6 years ago
luoyang d5317359c5 fix v2-manager.html header rolenow
6 years ago
luoyang e1e6f8a8c5 fix v2-manager.html header display
6 years ago
luoyang f7a229cddd fix v1-manager.html permission
6 years ago
taylor.dang 01cfdcdb55 Merge branch 'develop'
6 years ago
taylor.dang 72d5b25c7d fix
6 years ago
luoyang 81e1584c9a fix v1-manager.html
6 years ago
taylor.dang f257c60950 Merge branch 'develop'
6 years ago
taylor.dang 8b813a0e51 费率自动延期
6 years ago
yangkai 8ff1cc35af fix
6 years ago
yangkai 7fc914f6ce fix
6 years ago
luoyang e19685ad99 fix v2-manager.html perimission
6 years ago
luoyang ec010193ce fix v2-manager.html role
6 years ago
luoyang 28a5d26c4f fix v2-manager.html permission
6 years ago
yangkai ac7836da81 页面头部修改
6 years ago
luoyang 465772c5dc fix v1-manager.html & v2-manager.html
6 years ago
yangkai 9c28923818 fix
6 years ago
yangkai b5b6a8b286 fix
6 years ago
luoyang 7d7ee28a4b Merge remote-tracking branch 'origin/develop_newUI' into develop_newUI
6 years ago
luoyang c63931939f fix v1-manager.html
6 years ago
yangkai 55879c5c20 交易管理ui调整
6 years ago
luoyang 919c7783be fix boot
6 years ago
hellolujian 3760a13d94 [fix]
6 years ago
james.zhao 6f060fd947 update
6 years ago
hellolujian d1c0e36e63 [fix]
6 years ago
hellolujian b069c37ea9 [fix]
6 years ago
hellolujian 0abda9f48a [fix]
6 years ago
yangkai a0d7a4c631 [fix]商户统计
6 years ago
james.zhao 99f74b1ee8 update
6 years ago
luoyang 643e8fc533 fix servant
6 years ago
luoyang dd34208113 fix servant
6 years ago
luoyang 24555404a2 fix servant
6 years ago
james.zhao 44fdc278ba 风控材料上传新界面
6 years ago
luoyang 784bd85360 change new ROLE & permission role
6 years ago
hellolujian 91e9574eb9 [fix]
6 years ago
hellolujian bf5467a5ad [fix]
6 years ago
luoyang adce31c4bf fix gatewayjs redirect
6 years ago
luoyang 162f4a7ef4 fix gatewayjs redirect
6 years ago
hellolujian 8b0dc466e9 [fix]
6 years ago
hellolujian 91648bcd96 [fix]
6 years ago
james.zhao 511904767c Merge remote-tracking branch 'origin/develop_risk' into develop_risk
6 years ago
james.zhao b5e44dbfc5 update
6 years ago
hellolujian 5daa8ab0b3 [fix]
6 years ago
yixian 2d8bf8931d Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 39e44c076d ABAfile comment update
6 years ago
james.zhao 76d20b07a0 Merge remote-tracking branch 'origin/develop_risk' into develop_risk
6 years ago
james.zhao 6ec6235ce0 update
6 years ago
taylor.dang eb77903ec1 Merge branch 'develop'
6 years ago
taylor.dang 30e1561315 app rpay订单查询
6 years ago
hellolujian 2efd7a04a7 [fix]更新已处理状态
6 years ago
hellolujian b3c20a18f1 [fix]
6 years ago
hellolujian 6c4288e3b6 [fix]
6 years ago
hellolujian f5e9503547 [fix]
6 years ago
james.zhao 5401e48eed update
6 years ago
james.zhao 51e2c14fff Merge remote-tracking branch 'origin/develop_risk' into develop_risk
6 years ago
hellolujian c2587d1fa4 [fix]修复前端按钮显示,一键下载
6 years ago
james.zhao c2397259e0 文件上传页面增加前端限制
6 years ago
james.zhao c29d18b0a4 材料更新描述
6 years ago
james.zhao e96db30864 fix
6 years ago
james.zhao a7677a8cee update
6 years ago
hellolujian 01f94ad1df update
6 years ago
hellolujian e4a9ed5e3f Merge remote-tracking branch 'origin/develop_risk' into develop_risk
6 years ago
hellolujian 336ba5070b Merge branch 'develop_risk' of E:\globalPay\manage_develop_9009\royalpay.manage with conflicts.
6 years ago
james.zhao a92f4876f1 提醒填写风控材料的邮件
6 years ago
james.zhao 1eb2811503 风控邮件更新
6 years ago
luoyang 3ac5703edc fix rpay+switchMerchantSettle
6 years ago
luoyang bf8a94a620 fix rpay+switchMerchantSettle
6 years ago
taylor.dang 52612cad65 Merge branch 'develop'
6 years ago
james.zhao 671c27649f update
6 years ago
james.zhao ccbd5a9c3a 风控邮件
6 years ago
james.zhao dd11125c0f Merge remote-tracking branch 'origin/develop_risk' into develop_risk
6 years ago
james.zhao f61cd5be0b update
6 years ago
hellolujian f99a5a6ff5 update
6 years ago
luoyang 546df5fef0 fix rpay+ modifySurchargeConfig on
6 years ago
hellolujian d0532b21da [fix]完善风控业务流程
6 years ago
hellolujian 8502b52c3f [fix]风控业务流程
6 years ago
luoyang 7c0bc3f019 add version controller
6 years ago
taylor.dang a6042c523e Merge branch 'develop'
6 years ago
taylor.dang 3ede159d97 fix
6 years ago
yangkai b947cc63a0 fix
6 years ago
luoyang 93f2af4d52 fix BD-ng-click
6 years ago
luoyang 3ff563307f add ui-route && permission
6 years ago
yangkai 1fdbce200c fix
6 years ago
luoyang 53f60669a3 fix something
6 years ago
luoyang 419758b21f fix ui-view
6 years ago
yangkai 54b166a8f5 Main_Menu页面
6 years ago
luoyang 62e91a49cc add copyright
6 years ago
taylor.dang 5dbcfeedeb fix
6 years ago
taylor.dang 2a8ffb5475 fix
6 years ago
taylor.dang cd0695f33b fix
6 years ago