4011 Commits (0aa484338704833f4b828f69ea0647153309ca62)

Author SHA1 Message Date
liuxinxin 28e6bcc2f1 [R] R Services fix
5 years ago
duLingLing 5ad67054eb Upd:商户交易流水,订单列表增加第三方设备筛选条件
5 years ago
taylor.dang a4e001c3ec [Y] R service 加密参数
5 years ago
liuxinxin 7e613dffde [R] R Services fix
5 years ago
taylor.dang e173e25dcf [Y] R service 加密参数格式
5 years ago
taylor.dang 9ac244038a [Y] R service 加密参数
5 years ago
duLingLing 3b46cf5926 Upd:商户端清算文件,交易流水清算文件,变更显示数据类型样式
5 years ago
duLingLing 5c6e1c1b9c Upd:还原代码
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 ca6b6dbe24 Upd:修復交易排名數據五刷新
5 years ago
duLingLing 178532831d Upd:日报表KPI修改BD团队数量统计,由统计原领队商户量,更改为统计团队商户量
5 years ago
duLingLing a50dbd66a9 Upd:修改RService未开通渠道显示判断
5 years ago
duLingLing 9dd67049ee Upd:注释易宝相关代码
5 years ago
duLingLing c3b505e8f9 Upd:修改RService无图片替换图片
5 years ago
duLingLing 7bae858219 Upd:完善清算导出清算汇总Excel
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 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 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 63f12caff6 Upd:商户端WEB,APP查询数据异常
5 years ago
duLingLing 451310fc22 Upd:商户端WEB,APP查询数据异常修复
5 years ago
liuxinxin 1054f018b0 【R】商户端&运营端订单source处理
5 years ago
duLingLing a8f659549c Upd:交易流水查看条件-日期无进行时区转换问题
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
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
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
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
liuxinxin 78ddd81bbc 【R】广告位屏蔽同行业商户 fix
5 years ago
liuxinxin a7463fa4cc Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 64ea8a5d62 【R】广告位屏蔽同行业商户
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 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
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
luoyang bfeeb11ad9 fix merchant_application.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
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 515fc8ca91 add 自助进件优化
5 years ago
duLingLing bce2dae124 TradeLogs 添加商户数统计修改显示图标
5 years ago
duLingLing 7501bbbd2c TradeLogs 添加商户数统计修改显示图标
5 years ago
duLingLing 5c7d632ffb TradeLogs 添加商户数统计
5 years ago
liuxinxin e27155f776 【R】自助进件业务接口开发
5 years ago
luoyang 29283b0066 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 ef764cc2f8 add 广告位屏蔽同行业 1.2.47
5 years ago
liuxinxin f228d3acc3 【R】广告位屏蔽同行业商户
5 years ago
luoyang 9e11d4d2d8 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
duLingLing 60e59c538f Upd:App微信绑定字段增加union_id
5 years ago
duLingLing c4ac20095e Upd:新增查询微信绑定获取微信详情名称
5 years ago
luoyang 9c68bd9f8f fix same info只对合规和风控开放
5 years ago
duLingLing a6845d6c3c Upd:App用户个人设置绑定手机发送短信,手机国家编码字段处理
5 years ago
luoyang 6c0cd35c52 fix 自助进件提交合规
5 years ago
duLingLing 028d764b5a Merge branch 'develop_T1068_client_apply' of https://pms.globalfreepay.com/source/royalpay.manage into develop_T1068_client_apply
5 years ago
duLingLing 13d1d8faa9 Upd:还原配置信息
5 years ago
duLingLing d05bde6eb8 Upd:APP用户设置绑定解绑手机、微信
5 years ago
duLingLing b315f23776 Upd:APP用户设置绑定解绑手机、微信
5 years ago
luoyang 19079ef390 fix notify bd 对自助申请显示
5 years ago
luoyang 685a6df62b add 邮件密码 sysconfig表
5 years ago
liuxinxin 9c395906c8 【R】自助进件业务接口开发
5 years ago
yixian 56f15a2244 api for sending message to royalpay apps
5 years ago
duLingLing c19ecc816f Upd:app设置微信手机,绑定、解绑功能
5 years ago
liuxinxin b254d278cc 【R】自助进件业务接口开发
5 years ago
luoyang f9feb9dbca update 合同联系方式字段
5 years ago
duLingLing 19229e1da4 Merge branch 'develop' into develop_T1068_client_apply
5 years ago
duLingLing ed2acd46a8 Add:手机、微信登录
5 years ago
liuxinxin 4ba5ca0fe3 【R】自助进件业务接口开发
5 years ago
luoyang 6c684c0799 add app webview客服页面
5 years ago
luoyang 875482d168 add 暂时删除rpay+水晶立牌
5 years ago
duLingLing 99fbedcce5 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago
duLingLing 40d3a8428d Upd:日报表新增商户查询时间问题
5 years ago
luoyang 880f16c4be add 商户keyword搜索增加email && address
5 years ago
yixian 8005bec1bb parent update, fix compile error
5 years ago
luoyang 58eae9fcc9 add 报关api文档
5 years ago
luoyang fadfae50d5 add 报关api文档
5 years ago
duLingLing 0a50e52c15 Upd:每日报表发送时间提前1小时
5 years ago
duLingLing 56b18ed406 Upd:日账单KPI数据异常
5 years ago
yixian f590a95bb8 fix cast exception
5 years ago
luoyang 50ba01ce48 fix 清算预估微信到账金额
5 years ago
luoyang 832ce04069 fix risk页面 remark权限
5 years ago
luoyang ab67904720 fix dashboard settle开放pine
5 years ago
luoyang aa68308858 fix remark 软键盘导致remark确定失效
5 years ago
luoyang 9bae7ca6cc fix remark 软键盘导致remark确定失效
5 years ago
luoyang 5af22be3b3 add 风控业务增加remark字段、修复repeat重复
5 years ago
duLingLing 9b2a988805 Upd:日账单BD下新增商户数量
5 years ago
luoyang cbbfb39b58 fix 法人信息phone
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 f9896bd95b fix sub_manage switch切换
5 years ago
luoyang 3692aca1cf add 优化app交易流水查询sql分页、增加弹窗title返还
5 years ago
luoyang 05aacadc40 add 时间截止后端返还
5 years ago
luoyang 5e403680e2 fix 取消app默认7天查询时间
5 years ago
luoyang e522168292 fix 图片失败 onerror
5 years ago
luoyang caba08b6b6 fix 十月底截止提交文件
5 years ago
luoyang 648b3b5f01 fix app修改法人信息
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 876dc85384 hide bank details according to device
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 3a604879b7 fix logback name
5 years ago
luoyang 4d6ff46b78 add app父商户授权管理、风控业务增加remark
5 years ago
yixian 1c1d851f1e async logging
5 years ago
yixian a94405afa1 support oauth clients
5 years ago
yixian 8edd0ca663 GetMapping/PostMapping....Replacement
5 years ago
luoyang c5b5353c1e fix 收银系统选择其他提示
5 years ago
luoyang 43cb33a26c fix app订单流水查询过慢
5 years ago
luoyang 95369a462b fix open_status
5 years ago
luoyang 70927ba6ec fix 自助进件后 自动变成合同制作完成状态
5 years ago
luoyang 9e7e7d9acb fix open_status is null
5 years ago
yixian 0d18988fc5 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 26dae2cedf officedev profile
5 years ago
luoyang 1d845e6e34 fix
5 years ago
luoyang b5e7bd6321 add 活动开关
5 years ago
yixian 791122cfa4 officedev profile
5 years ago
liuxinxin be4c59fdf5 royalpay 水晶立牌海报替换
5 years ago
liuxinxin 847aef6596 [Royal Pay] 法人信息页面优化
5 years ago
luoyang 9b06025060 add dashboard 缓存
5 years ago
luoyang b4e59c5a01 fix 合同地址
5 years ago
luoyang 7720cf8c13 fix 制作临时合同同步最新合同
5 years ago
luoyang 6c6737a3b0 add 开通邮件发送联系人和法人、合同添加法人信息
5 years ago
luoyang e74825e720 fix bill code string
5 years ago
luoyang e192096d71 fix 同步商户自助申请填写法人信息
5 years ago
luoyang 0554ae5ca6 add 同步商户自助申请填写法人信息
5 years ago
liuxinxin 1bcf05993e Royal Pay
5 years ago
luoyang 2e5066ee23 fix 合规文件提交
5 years ago
yixian 489ef0ed4d Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian f49939ec86 ato report
5 years ago
luoyang 9145135abd fix result string
5 years ago
duLingLing b245b69991 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago
luoyang 3ae120844b fix 开启合规材料补充
5 years ago
duLingLing 05228f2694 UPD:风控发送催促邮件无区分问题
5 years ago
duLingLing bb397c2e09 UPD:风控发送邮件模板无区别问题
5 years ago
liuxinxin 42cee0be15 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
liuxinxin 6173d3256f royalpay法人信息页面展示bug修复
5 years ago
duLingLing 585c9d5dcd UPD:修复合伙人交易金额统计汇总重复
5 years ago
duLingLing 7fa03d7a41 UPD:风控业务返回上一层不清空查询条件
5 years ago
duLingLing 22a66b89c2 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
5 years ago
duLingLing c01428bc1f UPD:风控优化页面
5 years ago
luoyang 2f07701a27 add put
5 years ago
luoyang eca3daf0d3 add 增加图片和web上传
5 years ago
duLingLing aceb124d3d Upd:优化风控相关功能
5 years ago
yixian 518f36d51e ato report
5 years ago
yixian 311dc316a1 ato report
5 years ago
liuxinxin b8d30b4fbd [RoyalPay] 需求修改
5 years ago
yixian cd67cdcd6d Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 99f8f69054 upgrade parent
5 years ago
liuxinxin 834a5c66ba bug修复
5 years ago
liuxinxin 0c5d3da7e1 [RoyalPay] 需求修改
5 years ago
luoyang 5650fe1a7f fix 暂时关闭补充资料模块
5 years ago
luoyang a116631a34 add 商户签名增加ip、id、时间、设备信息字段,正式上线
5 years ago
luoyang f8963a18ba fix notify bd
5 years ago
luoyang 5cc0811af7 fix 下载合同
5 years ago
yixian a48446e302 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 7b487bd1ee ui error
5 years ago
luoyang 39a39048e4 add 更新说明文件、只对测试商户测试
5 years ago
luoyang 5718cb7a22 add 绿色通道、已通过商户补充合规资料、在线签署合同
5 years ago
luoyang f34a17e25c Merge remote-tracking branch 'origin/develop' into develop
5 years ago
luoyang 05ab1abd0c fix 优化弹窗样式
5 years ago
luoyang f966c32ac5 fix 优化样式
5 years ago
liuxinxin fc8d48eee6 合同样式调整
5 years ago
liuxinxin 2bc48120f6 合同制作
5 years ago
luoyang 67318a4be1 fix 签名样式
5 years ago
yixian c4848c521f ui error
5 years ago
luoyang 0d09e5f1dc add 文件上传失败pdf、清除用户缓存
5 years ago
liuxinxin c3abc56b62 loading样式
5 years ago
liuxinxin 266bb75d97 合同
5 years ago
liuxinxin e7fd2d08a0 合同样式
5 years ago
liuxinxin ca263de4d1 合同
5 years ago
liuxinxin 89373e11db 合同
5 years ago
luoyang 83dc97fcd9 fix source=4 不需要补全文件
5 years ago
luoyang 19db06bd53 fix return按钮
5 years ago
luoyang 2f13b89f70 fix 合规文件为空的商户
5 years ago
luoyang dcb3ca2f68 add 合同在线签订
5 years ago
liuxinxin 0cc49d7113 签名
5 years ago
luoyang cd7a8948a0 优化返回按钮
5 years ago
liuxinxin 77a2a01c02 签名
5 years ago
liuxinxin cbcc7f1f07 签名
5 years ago
todking eb55465a96 fix sql
5 years ago
luoyang 954dd83acf fix ui
5 years ago
todking c01647f1d4 add 交易趋势接口
5 years ago
liuxinxin 6c6fed89a6 合同
5 years ago
luoyang 36facdf46c fix
5 years ago
luoyang 7e9b36605c fix 制作合同返还数据
5 years ago
luoyang 8cd237cd44 优化样式、屏蔽下载按钮
5 years ago
luoyang 8cb8c5e027 add 合同client信息返还
5 years ago
luoyang ace8e86a09 优化首页弹窗样式
5 years ago
liuxinxin 42d2356ffa 合同
5 years ago
liuxinxin 51b929313d 合同
5 years ago
liuxinxin 2526ce3aef 合同
5 years ago
luoyang f5eb9ec4a4 fix 后手续费取字段
5 years ago
luoyang 8ac67b1726 fix 后付费手续费前端显示、冲正金额
5 years ago
liuxinxin 53fa4c29dd 合同
5 years ago
liuxinxin b0ee115770 fix
5 years ago
luoyang 862acb6bc4 add app重复签订合同、web业务优化
5 years ago
duLingLing d6f4c64194 Upd:风控业务,修改内部调用人邮箱使用
5 years ago
duLingLing a664f2b79a Upd:风控业务,修改内部调用人邮箱使用
5 years ago
duLingLing 94dbe6f9de Upd:发送风控邮件,删除ip显示,内部调用信息添加描述内容显示
5 years ago
liuxinxin 20f6082399 商户合规材料
5 years ago
duLingLing 1c7fc80815 Upd:修复合伙人销量数据分析页面显示数据问题
5 years ago
liuxinxin 2668a3b9b8 Merge remote-tracking branch 'origin/develop_newAuthFile_T863' into develop_newAuthFile_T863
5 years ago
liuxinxin 973915cde0 商户合规资料
5 years ago
luoyang b36e9d11c8 fix 优化代码
5 years ago
liuxinxin 29b4ca0703 商户资料
5 years ago
luoyang eec19b4d3f fix 合规审核文件界面
5 years ago
duLingLing 946b4c8f94 Upd:数据完整性校对修改
5 years ago
luoyang f70cc938da fix 代码优化
5 years ago
liuxinxin 8524367385 商户资料
5 years ago
liuxinxin 2367e27ed8 AlphaPayUS 账户创建bug修复
5 years ago
yixian 089f7fc571 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 60baa2682a aba file
5 years ago
luoyang 5ccff0ef78 add app接口、代码优化
5 years ago
luoyang 4703b26ede revert 商户自助进件补充材料 html
5 years ago
luoyang 43bc5f83c8 revert 商户自助进件补充材料js
5 years ago
luoyang 263fbf42f4 add 代码优化、移动端新增合规文件状态
5 years ago
luoyang 94ad879dc5 fix client_less_info
5 years ago
liuxinxin a4481c6c0e 商户合规资料不全,补充商户资料
5 years ago
duLingLing ed16bafbf6 Upd:修改sql别名使用错误问题
5 years ago
luoyang 5822cbc520 add app 获取源合同文件、合成签名后文件url接口
5 years ago
duLingLing 7da8c92566 Upd:修改定时任务时间
5 years ago
duLingLing 24b3d742b2 Upd:修复查看合伙人数据误差
5 years ago
taylor.dang 6eda5b1af0 css
5 years ago
duLingLing 608652d093 Upd:修改定时任务时间
5 years ago
duLingLing 52091e5de8 Upd:修改定时任务键名称
5 years ago
yixian 6740488ef1 Merge remote-tracking branch 'origin/develop' into develop
5 years ago
yixian 75a7461009 export merchant excel ui button
5 years ago
luoyang 4dc79f41dd fix 运营获取合规文件增加file_id
5 years ago
luoyang 0e35c2759b add 获取合规文件新接口 & 优化登陆返还字段
5 years ago
duLingLing 2aa3f072fe Upd:优化BD销量,合伙人交易量数据查询
5 years ago
taylor.dang 042c95fed1 [Y]移除tax_in_surcharge操作:费率自动延期、上传商户材料等
5 years ago