Commit Graph

974 Commits (master)

Author SHA1 Message Date
lyt 61ed0768b8 fix: wxpay notice 6 years ago
cyc 55a9a3666d 部署钉钉提交审批 6 years ago
lyt 32ad56c451 Merge branch 'feature/trippest' 6 years ago
lyt a851b6def6 fix: 去除重复拼团号的空值 6 years ago
lyt 5a96b07c04 Merge branch 'feature/pay' 6 years ago
lyt 463ba24da8 fix: 查到多个订单号时按照是否有效订单排序 6 years ago
lyt 659f92d6c2 Merge branch 'feature/pay' 6 years ago
lyt 9045f8d89f fix: APP订单号错误, 含HTML 6 years ago
lyt eae987674e Merge branch 'feature/pay' 6 years ago
lyt 528bba3c48 fix: 退款未导入修正传统团的查询 6 years ago
lyt c2d62595b2 Merge branch 'feature/pay' 6 years ago
lyt 7aac50850d feat:wxpay send 6 years ago
lyt fe46f903f0 Merge branch 'feature/trippest' 6 years ago
lyt eb25db079a feat:Trippest自动核查成本:不排除TA奖励团 6 years ago
lyt da7e8443b1 Merge branch 'feature/trippest' 6 years ago
lyt c9a8049fbc feat: Trippest预审核:数据正常的提示 6 years ago
lyt dce8e008ba Merge branch 'feature/trippest' 6 years ago
lyt e5550c4702 feat: Trippest预审核:数据正常的提示 6 years ago
lyt a84b86851d Merge branch 'feature/pay' 6 years ago
lyt 6939c7cb6f feat: 收款后标记订单成行 6 years ago
lyt ad3b5ae5dc Merge branch 'feature/pay' 6 years ago
lyt ecaa281214 feat: PayPal处理webhook推送, IPN未收到结果 6 years ago
lyt 09facead1b Merge branch 'feature/pay' 6 years ago
lyt 2f112ac48b fix: 不排除无效订单 6 years ago
lyt 3f121d0d7d Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 4b9bc60606 feat: Trippest计划:区分是否按综费结算 6 years ago
lyt 565d354045 Merge branch 'feature/pay' 6 years ago
lyt d746fab3a9 fix: 排除无效订单 6 years ago
lyt 4af14f4b92 Merge branch 'feature/pay' 6 years ago
lyt 5cd5555c7e fix: 排除无效订单 6 years ago
lyt 2a0b1bba79 Merge branch 'feature/trippest' 6 years ago
lyt 43f0fae7b7 Trippest账单:拼团订单包含取消团 6 years ago
lyt 3f29751074 Merge branch 'feature/trippest' 6 years ago
lyt 206e00279d Trippest账单:查询订单的条件调整 6 years ago
lyt 6e40036573 Merge branch 'feature/trippest' 6 years ago
lyt d1a853b81a Trippest账单: 缺少产品信息的团 6 years ago
lyt 3e8d1d8e83 Merge branch 'feature/pay' 6 years ago
lyt b665c5679d fix: 匹配传统订单时,原订单含有空格 6 years ago
lyt 5d6815aab2 Merge branch 'feature/pay' 6 years ago
lyt 4bb504224e feat: PayPal获取记录信息 6 years ago
lyt 3ce1f53948 Merge branch 'feature/pay' 6 years ago
lyt eb3d97d6b8 移动端样式 6 years ago
cyc b4e418d83a 修改错误 6 years ago
cyc 6dffc9da13 添加短信记录到瀚特 6 years ago
cyc cd31e6f814 部署短信发送 6 years ago
lyt 875e8cf6cb Merge branch 'feature/pay' 6 years ago
lyt a751733e6c fix: iPaylinks邮件语种 6 years ago
lyt 951d6604e5 Merge branch 'feature/pay' 6 years ago
lyt 19a42d10d3 fix: iPaylinks邮件语种 6 years ago
lyt 63e6fe3881 Merge branch 'feature/pay' 6 years ago
lyt d0bfe5876b fix: iPaylinks邮件语种 6 years ago
lyt 364c9ca89a Merge branch 'feature/trippest' 6 years ago
lyt c39b322136 feat: 未确认的不同步但是更新时间 6 years ago
lyt 7030ed4fb4 Merge branch 'feature/trippest' 6 years ago
lyt 59ee9d682e fixed: Trippest同步: 解决团号相同但地接订单号不同 6 years ago
lyt 8aca2e9d02 Merge branch 'feature/trippest' 6 years ago
lyt a25a468b31 feat: 财务导出的明细: 修正重复团号的总成本 6 years ago
lyt 546776496c Merge branch 'feature/pay' 6 years ago
lyt 76a427d38c feat: PayPal导出收款记录: 先指定币种 6 years ago
lyt cbee255f1c Merge branch 'feature/trippest' 6 years ago
lyt 1cb0b7152d fix: Trippest: 未确认的同步订单不更新 6 years ago
lyt 7a3dc6e706 Merge branch 'feature/pay' 6 years ago
lyt ebfbc0ff3b fix: js jq v1.9+ mise error 6 years ago
lyt 7ca9c3ddca Merge branch 'feature/pay' 6 years ago
lyt 71622c87b3 fix: WeChatPay 页面bug 6 years ago
lyt b79ed067ec Merge branch 'feature/trippest' 6 years ago
lyt 2ba826c8af feat: Trippest账单: 财务表的拼团总成本对比实际拼团总成本 6 years ago
lyt 726b7d0ae9 Merge branch 'feature/trippest' 6 years ago
lyt eb7e1b35ab fix: 同个产品拼多次 6 years ago
lyt 6b7dc66dd4 Merge branch 'feature/pay' 6 years ago
lyt 734a6b9c7f fix: PayPal状态=completed的所有退款行为 6 years ago
lyt ff30c959da Merge branch 'feature/trippest' 6 years ago
lyt 98ef4396de feat: Trippest账单解决不同地接社拼团号相同等问题 6 years ago
lyt bae5ac730a Merge branch 'feature/pay' 6 years ago
lyt aaff926ab0 fix: PayPal:APP组没有交易号的情况处理 6 years ago
lyt 364223f229 Merge branch 'feature/pay' 6 years ago
lyt a93abccc03 fix: PayPal:APP组没有交易号的情况处理 6 years ago
lyt 5e8bae61db Merge branch 'feature/pay' 6 years ago
lyt cbbf93c03a feat: iPaylinks refund APP组 6 years ago
lyt f841d333f6 Merge branch 'feature/trippest' 6 years ago
lyt 16bdae5534 修复表格 6 years ago
lyt 6cd93e65fa Merge branch 'feature/trippest' 6 years ago
lyt 161a3c7703 feat: Trippest:修改自动审核账单,汇总表相关 6 years ago
lyt 9cd43e73da Merge branch 'feature/trippest' 6 years ago
lyt ac631e0da9 feat: Trippest自动审核+总收入差额 6 years ago
lyt d24f215a39 返回版本: 上一个版本仅做临时功能的备份 6 years ago
lyt 233ff82e2d feat: iPaylinks下载交易记录录入系统, 为了解决服务器没有接收到异步通知时的紧急订单录入.正常情况不使用此功能 6 years ago
lyt f782f73d98 Merge branch 'feature/trippest' 6 years ago
lyt dc908f4edd Trippest账单:处理拼团号相同的情况 6 years ago
lyt e08c2ed433 Merge branch 'feature/trippest' 6 years ago
lyt f8ff0f8eb0 Trippest账单: 自定义产品计算 6 years ago
lyt 311050d24f Merge branch 'feature/trippest' 6 years ago
lyt b4f9528346 Trippest自动生成账单,周期一个月 6 years ago
lyt 5828e39573 fix: Trippest自动审核账单:成本表格的团号字段修正 6 years ago
lyt 9754adebd5 Merge branch 'feature/trippest' 6 years ago
lyt e6328f5bc7 fix: 账单预审核:取订单子表的走团日期 6 years ago
lyt 3568f9d3e5 Merge branch 'feature/pay' 6 years ago
lyt 9ef291e6ba feat: PayPal匹配Trippest订单: 增加外部订单和HT订单号:多对一 6 years ago
cyc ac0657bfa8 修改值班表 6 years ago
lyt 267da7720b Merge branch 'feature/trippest' 6 years ago
lyt 9861ce04f2 reset upload form 6 years ago
lyt 695c627708 Merge branch 'feature/trippest' 6 years ago
lyt c6ad881109 Trippest成本文件格式 6 years ago
lyt 1dd1d4b1d6 Merge branch 'feature/trippest' 6 years ago
lyt 00de50264d Trippest自动核对账单 6 years ago
lyt b857004fa0 Merge branch 'feature/trippest' 6 years ago
lyt ab62b440e3 修正日期 6 years ago
lyt 1d95214cbc Merge branch 'feature/trippest' 6 years ago
lyt 5c1cf4ea40 记录地接代收:5 6 years ago
lyt 04b65d2044 Merge branch 'feature/trippest' 6 years ago
lyt ca16566b83 Trippest:记录地接代收 6 years ago
cyc d9d55e3cd1 修改邮件发送 6 years ago
lyt 06be970ec0 Merge branch 'feature/trippest' 6 years ago
lyt cbd741c26c Trippest结算:供应商名称 6 years ago
lyt efd060984d Merge branch 'feature/trippest' 6 years ago
lyt ffe939c021 Trippest同步:成本增加房费 6 years ago
lyt 24fa550ec7 Merge branch 'feature/trippest' 6 years ago
lyt 47ed77140f 不生成账单 6 years ago
lyt 8a3e3d8ad6 Merge branch 'feature/trippest' 6 years ago
lyt bb62f862bb 记录渠道实收 6 years ago
lyt 8f09ca1184 Trippest同步:增加记录渠道总实收 6 years ago
lyt 679c5b3fab Merge branch 'feature/trippest' 6 years ago
lyt 63990f9427 Trippest同步成本:删除出发时间排序,避免拆分的订单成本更新失败 6 years ago
lyt 6a0903e886 Merge branch 'feature/pay' 6 years ago
lyt 8589de4d60 Alipay转移记录;未发送的优先显示 6 years ago
cyc 53e039334c 删除所有权限限制 6 years ago
cyc cacbd822e5 删除值班表权限限制 6 years ago
lyt eafe7ce449 Merge branch 'feature/trippest' 6 years ago
lyt 75472bb5e5 Trippest财务表:PVT人数的取值 6 years ago
cyc 99b32fceb6 修改value签名文本 6 years ago
lyt 9d3d42acd7 Merge branch 'feature/trippest' 6 years ago
lyt ba6e33c083 Trippest同步:字符串编码问题 6 years ago
lyt 0eccc1b125 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 381e91d508 地接计划:商务订单备注PVT的团计划指定团队类型 6 years ago
lyt 2b22b6eb80 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 550fa1f348 地接计划:大车交通的团队类型 6 years ago
lyt 185ccbf879 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 0cb628cdd1 地接计划: 大车游设为散拼类型 6 years ago
lyt f5449a39f5 Merge branch 'feature/trippest' 6 years ago
lyt b9c66f168b Trippest自动生成账单:缩短周期 6 years ago
lyt cddb7b27fa Merge branch 'feature/trippest' 6 years ago
lyt 931c60c258 Trippest同步:订单详情信息获取,增加预定时间是今天的订单. 6 years ago
lyt 1970618fc7 Merge branch 'feature/trippest' 6 years ago
lyt 1dcd7dc757 Trippest同步: 订单成形状态 6 years ago
syh101 eb51070b6c Merge branch 'master' of https://gitee.com/hainatravel/information-system 6 years ago
syh101 08237315af 微信求职页面 发送给王婷的邮件 内容发生变化 6 years ago
lyt a87579975e Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 937e23318b 地接计划:Trippest产品的产品类型 6 years ago
lyt 0e9e685da4 Merge branch 'feature/pay' 6 years ago
lyt f10ea072d1 退款财务:修复商务订单没有团号问题 6 years ago
lyt db3d024405 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 3ac969cb3a 地接计划:产品没有缺省供应商 6 years ago
lyt 76f6f5c743 Merge branch 'feature/trippest' 6 years ago
lyt bc70c31318 Trippest财务表:增加成本审核有误的明细,解决成本明细的总额和拼团成本总额的不一致 6 years ago
lyt 769c49a185 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 9fd7cbc86c 地接计划: 取消商务订单的PVT处理 6 years ago
lyt 6f7bd1d59f Trippest结算:删除测试方法 6 years ago
lyt f47521a410 Merge branch 'feature/trippest' 6 years ago
lyt d76d23f84a Trippest结算:导出明细 6 years ago
lyt d3b36fccdf Trippest汇总:下载明细:查询数据 6 years ago
lyt 2ce5d0dc94 Merge branch 'feature/trippest' 6 years ago
lyt 718b396938 Trippest同步:取消团保留拼团号 6 years ago
lyt eba0f993cd Merge branch 'feature/trippest' 6 years ago
lyt 22b16d9bfb Trippest财务表:渠道价计算修改 6 years ago
lyt c42919aeaa 地接计划:预定项目使用产品关联查找Trippest项目组的产品 6 years ago
lyt 93d040d1ea Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 3272699f6f 地接计划:线路订单的码头接送 6 years ago
lyt 198726a888 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 6e19a3758f 地接计划:码头接送和打车游按拼团 6 years ago
lyt 7f94740a48 Trippest结算汇总:多地预订的团款计算 6 years ago
lyt a654b8190a Trippest结算汇总:多地预订的团款计算 6 years ago
lyt d8b1a6a738 Merge branch 'feature/trippest' 6 years ago
lyt 74bf566485 Trippest结算汇总:解决多地产品预订无法按目的地类型计算 6 years ago
lyt 6cc206dd50 Merge branch 'feature/pay' 6 years ago
lyt c1243a793c 触发财务的退款通知 6 years ago
cyc 83e4c35d50 修改value系统 6 years ago
syh101 9c25284b04 确认信链接指向本地: 6 years ago
syh101 5baea42a5a 修改地址 6 years ago
syh101 09cb6df129 将确认信链接指向本地: 6 years ago
lyt 290b4d4a04 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 236758c0db 地接计划:今天发的急单 6 years ago
lyt 24e39c7e3b Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt d9a0818137 地接计划:相同日期不同行程类型的拆分 6 years ago
lyt e070c0d781 Merge branch 'feature/pay' 6 years ago
lyt 9ac653dccd APP组的后缀A, 支持查询录入状态和转移记录 6 years ago
lyt 339e9851fd Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt e886059f98 地接计划:分销预订Trippest产品问题 6 years ago
lyt dc8b3b4f89 Merge branch 'feature/trippest' 6 years ago
lyt 057cb6ec09 Trippest同步订单:更新启程和结束日期 6 years ago
lyt 82ddd2b24e Merge branch 'feature/pay' 6 years ago
lyt 42d881a2b2 bug 6 years ago
lyt ecda33efa9 Merge branch 'feature/pay' 6 years ago
lyt cd7d16197c Alipay账单的APP退款,更新发送状态 6 years ago
lyt ecfbc1c0cf Merge branch 'feature/pay' 6 years ago
lyt 445676d267 Alipay账单的处理,不发送以前的邮件 6 years ago
lyt 706809d978 Merge branch 'feature/pay' 6 years ago
lyt a1af22ee13 Alipay下载账单不重复写入note 6 years ago
lyt 1f0148634e Alipay APP退款处理 6 years ago
lyt 1f7e9e20bf Merge branch 'feature/pay' 6 years ago
lyt 4c8f3fb867 Alipay 账单中的APP交易 6 years ago
lyt aa6dec8709 Merge branch 'feature/pay' 6 years ago
lyt ad583f130e Alipay下载对账单 6 years ago
lyt c95f3a1c18 Merge branch 'feature/pay' 6 years ago
lyt 1b5433e16f curl日志 6 years ago
lyt 469f11c082 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 47b7f20573 地接计划:增加客人年龄计算 6 years ago
lyt c594b96b6b Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt f2b9dae2cb 地接计划: 商务组的tour设为团队 6 years ago
lyt b4d3c9f628 Merge branch 'feature/pay' 6 years ago
lyt 4e2ece1a67 退款:出团时间在上月底之前的需要发送财务 6 years ago
lyt 8f84fd36fb Merge branch 'feature/trippest' 6 years ago
lyt 21a481dc82 Trippest财务表:fixed团名长度 6 years ago
lyt d6f38f4547 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt c07aa33676 地接计划:fixed客人年龄计算 6 years ago
lyt 606f8fce0f Merge branch 'feature/pay' 6 years ago
lyt a55af92516 通知处理的url在配置文件 6 years ago
lyt 263c4e97ba wxpay:下载账单之后即调用通知处理 6 years ago
lyt 943dca639d Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt c991d022a6 地接计划:客人生日信息仅日期 6 years ago
lyt 001958356c Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 6c9e9af87c 地接计划:每个客人的国籍;酒店预订和日期填入用房标准;线路信息中的酒店只取名称 6 years ago
lyt 391dc435fe Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 3072931a46 地接计划:客人信息只留一个人的电话;增加性别补充在其他信息中 6 years ago
lyt d963ef7eb3 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 638946cb85 地接计划:fixed客人信息姓名字段bug 6 years ago
lyt 312d4c4704 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt c458e0e5b5 删除覆盖 6 years ago
lyt 6a79badf2f 地接计划:增加生日,国籍, 护照有效期 6 years ago
lyt 88ab354418 地接计划: 传统团:发送导游备注. 6 years ago
lyt 6639ba83e9 Merge branch 'feature/plan-auto-send-release' into feature/plan-auto-send 6 years ago
lyt 524f2d3753 地接计划:订票业务名称修改;传统团导游备注生成 6 years ago
lyt ca18b92155 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 4baf1b8808 增加客源地;增加客人手机号 6 years ago
lyt 57d23be77d Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt a54d4370bf 地接计划:fixed 首站城市在通宵火车或接机时为空问题 6 years ago
lyt 4bd5ee8d5a Merge branch 'feature/pay' 6 years ago
lyt 11da5662e6 不发邮件的更新关闭状态 6 years ago
lyt a3bf74621f Merge branch 'feature/pay' 6 years ago
lyt c8afb70029 去掉默认的订单类型后缀 6 years ago
lyt 9234b75c33 Merge branch 'feature/plan-auto-send-release' 6 years ago
lyt 492438c8d2 地接计划:发送在等待第一次发送时就有变更的 6 years ago
lyt 7b9de7c068 Merge branch 'feature/trippest' 6 years ago
lyt 55d57090de Trippest生成财务表:数据库插入错误 6 years ago
lyt c9ba7e356f Merge branch 'feature/trippest' 6 years ago
lyt 3257e3b905 Trippest生成财务表:数据库插入错误 6 years ago
lyt 07f28fa89e Merge branch 'feature/trippest' 6 years ago
lyt 0a9bd19874 Trippest生成财务表:数据库插入错误 6 years ago
lyt f1db10cbe2 Merge branch 'feature/pay' 6 years ago
lyt 82e46d30c4 发送状态显示 6 years ago
lyt 13cbdb81b5 Merge branch 'feature/pay' 6 years ago