622 Commits (f906e0e46e472b2199d7d6be1a1e9d20c6ba5b5c)

Author SHA1 Message Date
luoyang 6efe8ce301 add 商户自定义配置 hide_mch_device 隐藏设备
5 years ago
luoyang 674ae4b1f8 fix 增加测试账号leoh
5 years ago
luoyang f864b7c695 add level3_mch_config 自动配置
5 years ago
luoyang 04d44f8bef add ka商户子商户检索支持
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 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 f1b2c2f453 【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 ccfabff97d add popup增加显示次数控制
5 years ago
luoyang 140fe334ee fix geek act
5 years ago
liuxinxin c1e46d9e4d 【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
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 bbfcf099a1 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 6b567ea463 fix pom.xml
5 years ago
luoyang 0b0161f7a3 fix 进件api删除多余行业,增加RsvcServer接口
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
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 44e44af0bb add gateway 商户进件相关功能
5 years ago
luoyang 246ef08ab8 1.3.24 增加surcharge_rate 字段,后续未调整
5 years ago
taylor.dang 0582321556 [Y] 新增禁止查询level3商户开关
5 years ago
dulingling 073df7b0ee Upd:客户订单交易数据修改为无交易也显示日期
5 years ago
liuxinxin d8d371dbc1 [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 ee1e41f66b add kyc update
5 years ago
luoyang 9da043de5c add 清算表格增加dev remark
5 years ago
liuxinxin bc49f7667d [R] fix
5 years ago
liuxinxin 5d277bf0b9 [R] APP端接口调整
5 years ago
dulingling 0404b35b1f Add:添加支付宝支付页面
5 years ago
liuxinxin b22ecb893e [R] pom
5 years ago
liuxinxin b35e33fc0a [R] APP端接口调整
5 years ago
luoyang fa7e289d51 fix wx notify
5 years ago
duLingLing c71b44eef4 Add:新增微信支付页面
5 years ago
luoyang 39c08c4394 fix pom.xml
5 years ago
luoyang 81ef18360a fix rservice apply
5 years ago
luoyang 2691047d15 add 合规审核R-services扣款申请,接收来自Rservices的扣款申请推送
5 years ago
duLingLing f906f0d9c8 Upd:修复提供接口错误字段
5 years ago
taylor.dang eea73c3b20 [Y] R service新增参数 & 修改清算文件
5 years ago
duLingLing bcafcdcb29 Upd:服务提供spms读取数据结构查询条件
5 years ago
duLingLing e12419d3b8 升级版本
5 years ago
taylor.dang e173e25dcf [Y] R service 加密参数格式
5 years ago
taylor.dang 9ac244038a [Y] R service 加密参数
5 years ago
duLingLing 06c3bc7496 升级版本
5 years ago
duLingLing 627c922ec3 升级核心包
5 years ago
duLingLing bf4085b07c Upd:App登录退出补偿
5 years ago
duLingLing ca6b6dbe24 Upd:修復交易排名數據五刷新
5 years ago
duLingLing c3b505e8f9 Upd:修改RService无图片替换图片
5 years ago
luoyang 169365e03f fix pom.xml
5 years ago
duLingLing 377dd3a489 升级版本
5 years ago
luoyang da10968f48 fix pom.xml
5 years ago
luoyang f5d17b5083 fix pom.xml
5 years ago
luoyang fcbaeae808 add R services
5 years ago
luoyang 36c6d99d84 Merge branch 'devlop-T1125-R-Rervice' into develop
5 years ago
duLingLing f72ab6e8d5 Upd:交易流水查看timezone空指针异常处理
5 years ago
duLingLing 63f12caff6 Upd:商户端WEB,APP查询数据异常
5 years ago
duLingLing a8f659549c Upd:交易流水查看条件-日期无进行时区转换问题
5 years ago
duLingLing f7c049a2d6 Upd:App查看交易流水汇总异常处理
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
duLingLing efc63cc373 R-service
5 years ago
luoyang d6074bc055 fix source_agree_file 排序问题
5 years ago
luoyang 623ec31c91 add 订单来源 source支持
5 years ago
duLingLing f4834125cc Upd:添加Gateway子分类
5 years ago
luoyang 3a50fc9dee fix 客户支付手续费导致提成组织成本手续费高
5 years ago
duLingLing d40b65ba6f Upd:登录识别字段由OpenId变更为unionId,微信不同平台相同识别字段为unionid
5 years ago
liuxinxin 87324141db 【R】自定义费率fix
5 years ago
duLingLing 7f871d1aa4 Upd:添加新闻增加标题字段,该字段只针对news创建使用
5 years ago
duLingLing 214195b24d UPD:修复商户-用户账号绑定异常问题
5 years ago
duLingLing f31d50c1e6 UPD:修复商户-用户账号绑定异常问题
5 years ago
duLingLing 5ba4873bfa Upd:修复管理端微信绑定查询已绑定用户报错问题
5 years ago
luoyang 2212a02829 fix 商户手机号 size>0
5 years ago
luoyang d3cb52c869 fix pom.xml
5 years ago
luoyang 794e637559 fix customer_surcharge_rate 未通过也可以设置
5 years ago
luoyang e3211c89fa fix findAccountByPhone
5 years ago
luoyang 3363146993 fix findAccountByPhone查到多条记录
5 years ago
luoyang bdba35af67 fix 恢复注释
5 years ago
duLingLing 1a304a9fd5 UPD:修改微信确定绑定,优先校验用户名密码
5 years ago
duLingLing b7e4a0043b 升級版本
5 years ago
duLingLing ac6f9877e1 刪除ip限定
5 years ago
luoyang 0db2b3a576 add 自助进件调整
5 years ago
duLingLing 4fd9de60e8 个人设置新增接收解绑发送验证码接口
5 years ago
duLingLing 5a1dec2a47 个人设置新增接收解绑发送验证码接口
5 years ago
duLingLing 5315d8ddbc Upd:修改个人设置短信验证码发送接口
5 years ago
duLingLing 13df0df1c1 Upd:修改错误名称
5 years ago
luoyang 6260572efc fix 微信子商户号申请
5 years ago
luoyang 09a9488055 fix pom
5 years ago
luoyang 231e19ea2f fix pom
5 years ago
duLingLing bce2dae124 TradeLogs 添加商户数统计修改显示图标
5 years ago
duLingLing 7501bbbd2c TradeLogs 添加商户数统计修改显示图标
5 years ago
duLingLing 5c7d632ffb TradeLogs 添加商户数统计
5 years ago
luoyang 29283b0066 fix App时区
5 years ago
luoyang 4b1939fb9f fix App时区
5 years ago
luoyang c839f31b97 fix app夏令时
5 years ago
luoyang ef764cc2f8 add 广告位屏蔽同行业 1.2.47
5 years ago
yixian 850090b0be add logger for RetailAppMessage sender api
5 years ago
luoyang 6c0cd35c52 fix 自助进件提交合规
5 years ago
luoyang 57f2c80443 fix pom
5 years ago
luoyang 685a6df62b add 邮件密码 sysconfig表
5 years ago
luoyang f9feb9dbca update 合同联系方式字段
5 years ago
luoyang 875482d168 add 暂时删除rpay+水晶立牌
5 years ago
duLingLing 5c1fbd6957 Upd:版本升级
5 years ago
luoyang 880f16c4be add 商户keyword搜索增加email && address
5 years ago
luoyang 6869cbdd3f fix pom.xml
5 years ago
luoyang c3a0a3aeb0 fix pom.xml
5 years ago
yixian c7ef885006 parent update, fix sandbox error
5 years ago
duLingLing 0a50e52c15 Upd:每日报表发送时间提前1小时
5 years ago
duLingLing 56b18ed406 Upd:日账单KPI数据异常
5 years ago
luoyang 50ba01ce48 fix 清算预估微信到账金额
5 years ago
luoyang 5af22be3b3 add 风控业务增加remark字段、修复repeat重复
5 years ago
duLingLing 9b2a988805 Upd:日账单BD下新增商户数量
5 years ago
duLingLing 8cf764bddf Upd:升级版本
5 years ago
luoyang 40015c1b96 add App增加订单查询接口支持
5 years ago
duLingLing d30e9adeb1 Upd:管理端BD数据分析,手机端每日报表,变更查询新增商户逻辑为:统计BD下有效的新增商户,新转入商户
5 years ago
luoyang 05667b73b0 fix 增加sub_manage查询接口
5 years ago
luoyang 3692aca1cf add 优化app交易流水查询sql分页、增加弹窗title返还
5 years ago
luoyang 2a8958a019 fix pom.xml
5 years ago
luoyang 5e403680e2 fix 取消app默认7天查询时间
5 years ago
luoyang 5ea9ba1afe fix 城市为null
5 years ago
luoyang da9951c133 fix 城市为null
5 years ago
luoyang 5b40aebdc7 add 用户画像 关系图
5 years ago
luoyang b7c3033f1f fix cache 存入null
5 years ago
yixian 4eeadf4790 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 996a6a3d42 hide bank details according to device
5 years ago
luoyang 2e7b07df71 fix ip查询
5 years ago
luoyang e680eb1144 fix 风控审核提示语
5 years ago
luoyang 340c2ae677 fix logback name
5 years ago
luoyang 29ad00a7d3 fix pom
5 years ago
luoyang 4d6ff46b78 add app父商户授权管理、风控业务增加remark
5 years ago
luoyang 7a19b27dc0 fix pom.xml
5 years ago
luoyang 43cb33a26c fix app订单流水查询过慢
5 years ago
luoyang 70927ba6ec fix 自助进件后 自动变成合同制作完成状态
5 years ago
luoyang 0461e9277e fix pom.xml
5 years ago
yixian 7366223785 officedev profile
5 years ago
yixian 791122cfa4 officedev profile
5 years ago
luoyang 9b06025060 add dashboard 缓存
5 years ago
luoyang b4e59c5a01 fix 合同地址
5 years ago
luoyang 6c6737a3b0 add 开通邮件发送联系人和法人、合同添加法人信息
5 years ago
luoyang e74825e720 fix bill code string
5 years ago
duLingLing 7e5b1e8cfc Upd:邮箱模板修复更新版本
5 years ago
duLingLing 05228f2694 UPD:风控发送催促邮件无区分问题
5 years ago
duLingLing bb397c2e09 UPD:风控发送邮件模板无区别问题
5 years ago
duLingLing 585c9d5dcd UPD:修复合伙人交易金额统计汇总重复
5 years ago
duLingLing 7fe7eef17e UPD:风控业务需求变更
5 years ago
luoyang 2f07701a27 add put
5 years ago
luoyang eca3daf0d3 add 增加图片和web上传
5 years ago
yixian cd67cdcd6d Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 99f8f69054 upgrade parent
5 years ago
taylor.dang aa3d042a7d version
5 years ago
luoyang 5650fe1a7f fix 暂时关闭补充资料模块
5 years ago
luoyang a116631a34 add 商户签名增加ip、id、时间、设备信息字段,正式上线
5 years ago
luoyang 2c85268ca6 fix pom
5 years ago
luoyang f8963a18ba fix notify bd
5 years ago
luoyang 5cc0811af7 fix 下载合同
5 years ago
luoyang 5718cb7a22 add 绿色通道、已通过商户补充合规资料、在线签署合同
5 years ago
todking 5dfd2e6197 fix pom
5 years ago
todking 0e74888bea fix pom
5 years ago
luoyang 12256773b6 fix pom.xml
5 years ago
duLingLing d6f4c64194 Upd:风控业务,修改内部调用人邮箱使用
5 years ago
duLingLing a664f2b79a Upd:风控业务,修改内部调用人邮箱使用
5 years ago
duLingLing 94dbe6f9de Upd:发送风控邮件,删除ip显示,内部调用信息添加描述内容显示
5 years ago
duLingLing 1c7fc80815 Upd:修复合伙人销量数据分析页面显示数据问题
5 years ago
duLingLing 45bf1b3d41 Upd:校对BD销量,合伙人提成数据完整性修改升级版本
5 years ago
duLingLing ed16bafbf6 Upd:修改sql别名使用错误问题
5 years ago
duLingLing 7da8c92566 Upd:修改定时任务时间
5 years ago
duLingLing 24b3d742b2 Upd:修复查看合伙人数据误差
5 years ago
duLingLing 608652d093 Upd:修改定时任务时间
5 years ago
duLingLing 52091e5de8 Upd:修改定时任务键名称
5 years ago
duLingLing a9dcf5ba30 Upd:升级版本
5 years ago
taylor.dang 042c95fed1 [Y]移除tax_in_surcharge操作:费率自动延期、上传商户材料等
5 years ago
luoyang cf7e8cbcaa fix 风控业务
5 years ago
luoyang 9fddf8e0f9 fix pom.xml
5 years ago
luoyang af7885d671 add 风控确认收到风控材料按钮
5 years ago
taylor.dang 603ce4bfde [Y] pom
5 years ago
yixian 21ced08f55 export merchant list to excel.
5 years ago
duLingLing 3c33f9688b 修改数据分析定时任务调用接口接口路径
5 years ago
duLingLing e5b19f1503 添加数据分析定时任务调用接口
5 years ago
taylor.dang 74820c22af [Y] 修复stuff 提成异常
5 years ago
luoyang da102239b0 add app合规文件后端支持,修复后付费账户生成时间
5 years ago
duLingLing bef5184e23 Upd:升级版本
5 years ago
duLingLing b7631d79fa Upd:部分查询数据接口查询数据源改为只读数据源
5 years ago
duLingLing 792dfe944f Upd:退款接口添加数据指定为-只读库
5 years ago
taylor.dang 4648b9885e [Y] datasource
5 years ago
taylor.dang 74e9350373 [Y] remove druid
5 years ago
duLingLing 48c9ea9a3f Upd:更改数据源链接方式
5 years ago
taylor.dang e690d5c0a1 [Y] pay version & pom version
5 years ago
taylor.dang 9911ef697f [Y] 修改 datasource 默认值
5 years ago
duLingLing d6a4cbf658 Upd:修复多数据源切换无效问题
5 years ago
duLingLing 63282cea44 Upd:升级版本
5 years ago
duLingLing fc8f7545f1 Upd:读写数据分离
5 years ago
duLingLing efef3adf74 Upd:财务报表修清算额修改查询sql
5 years ago
luoyang 1be1411e1f fix pom.xml
5 years ago
luoyang b602e08f00 fix mailccs 为null
5 years ago
luoyang 121a5361c0 add App大额渠道开通弹窗
5 years ago
yangkai ab8511c0b1 bd新增lakalapay渠道显示
5 years ago
yixian ef6e45caa4 parent version
5 years ago
yixian c52556eca5 parent version
5 years ago
luoyang c612bee3ba add 支付宝线上批量报备range
5 years ago
luoyang 45286ac2d3 add 支付宝线上批量报备range
5 years ago
luoyang ca27ab3cf7 fix 退款占比预警增加风控人员微信推送
5 years ago
yixian 326e16838c update parent version
5 years ago
luoyang 52fda84527 fix 全量备份超时报错
5 years ago
luoyang 8c32b331ad add alipay online 全量备份
5 years ago
luoyang b53b11a1a1 add 支付宝online insert partner批量报备
5 years ago
taylor.dang f286a18c8c [Y] pom version
5 years ago
taylor.dang cf78550b99 [Y] 通知推送商户名单为30天内活跃商户
5 years ago
taylor.dang 41d15002d2 [Y] pom num
5 years ago
yixian 92bae223be abafile remark template
5 years ago
yixian ce4dd8ca7d pom version
5 years ago
yixian 7b487ff92e pom version
5 years ago
yixian 4c6e537b96 Merge branch 'develop'
5 years ago
yixian 092484a68b pom version
5 years ago
luoyang 5b7f5e43c5 add 新增组织管理员身份
5 years ago
luoyang 7529f0becd add PINE商户重置密码后账户信息放置mongo
5 years ago
luoyang da3a9a1cb8 fix 修复dashboard lakala订单以及取消pine密码发送邮件
5 years ago
luoyang 48f2151bc2 fix app修改商户信息可能会导致client_pay_type异常
5 years ago
taylor.dang 3aaf2d9953 全量开通CBPAY
5 years ago
taylor.dang 288bf599c7 全量开通CBPAY
5 years ago
luoyang ebcac47ea0 add 自助申请信息表格导出
5 years ago
luoyang b9d8612dc7 add 商户进件 商户编码检测
5 years ago
luoyang bf94261baf fix pom
5 years ago
luoyang 8328dfab95 fix 临时密码修复,过滤掉多余字段
5 years ago
yangkai 365d8ef3c8 添加版本号
5 years ago
james.zhao c713b17447 kpi fix
5 years ago
james.zhao 3ea6fdd4ba kpi开户数统计fix+团队交易量不屏蔽禁用BD
5 years ago
luoyang 46cdad1985 fix 合伙人提成surcharge_cashback
5 years ago
james.zhao 1340b3963e 日报展示屏蔽支出
5 years ago
luoyang bd49def962 fix
5 years ago
luoyang 810274f835 add 支付页切换清楚cache
5 years ago
luoyang 5eb476e82d 增加网银快捷支付新版页面
5 years ago
taylor.dang 9947ce5377 Merge branch 'develop'
5 years ago
taylor.dang 18bfb7e593 [Y] 开放 cashier 菜单权限 & 临时子商户号标记
5 years ago
james.zhao 47c7f03fd5 kpi fix
5 years ago
james.zhao e1f84ffc36 kpi 开户数统计
5 years ago
yixian 955e26b55e 瀚银上传文件被截断问题修复,诊断接口调整
5 years ago
yixian 259487570d 瀚银上传文件被截断问题排查
5 years ago
luoyang 19517c9bb8 线上没有网站的用royalpay官网代替报备
5 years ago
luoyang a855c5ff30 fix pom.xml
5 years ago
luoyang 1b0bd191e6 fix pom.xml
5 years ago
luoyang ccb526fda1 fix 报备19年1月1日开始的线上商户
5 years ago
luoyang cd1e832a19 fix pom.xml
5 years ago
james.zhao dc05490ba9 pom update
6 years ago
luoyang 9a4ec43f40 fix 退款额度
6 years ago
luoyang 22de253095 add good商品可配置项
6 years ago
james.zhao d3ca70329f 自主进件更新
6 years ago
luoyang 1f08a56397 fix v2 gateway 表主键
6 years ago
luoyang 8273f8949e fix v2 gateway 表主键
6 years ago
luoyang 8e12b4b7e5 add v2 gateway商户配置
6 years ago
luoyang eb08f3193f add 三级商户子商户相互退款
6 years ago
luoyang 060390ca9d fix 增加poster日志
6 years ago
luoyang 25ef91379f fix 后清算报表gst
6 years ago
luoyang fbea4cee5b fix 客服二维码
6 years ago
todking 166eb21e43 增加日志
6 years ago
luoyang ba5f37cbda add 自助申请场景选择
6 years ago
james.zhao a60f1f40c5 Merge remote-tracking branch 'origin/develop'
6 years ago
james.zhao 9186117ba3 日报开户数修复
6 years ago
luoyang 7df4f40bd7 add 商户场景选择
6 years ago
luoyang fc83c27d87 fix 合规商品验证
6 years ago
luoyang eede0722f7 fix mcc
6 years ago
luoyang 7d60b3607c fix remove main test
6 years ago
luoyang b65c2734e4 fix pom.xml
6 years ago
luoyang bd9e1731de fix 线下商户批量报备 有一种照片就进行报备
6 years ago
luoyang 840e7cd264 add 线下商户批量报备
6 years ago
luoyang 11abda951a fix 同步order_channel为“AlipayOnline”的商户
6 years ago