lyt
|
50867b9dea
|
Merge branch 'feature/trippest'
|
7 years ago |
|
lyt
|
b9929d7651
|
设置时间,获取3月份Trippest团成本
|
7 years ago |
cyc
|
9601bc543d
|
修改登录的调整地址
|
7 years ago |
|
cyc
|
136681861a
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
cyc
|
5a6fdc71b7
|
修改value系统调用登录验证的方式
|
7 years ago |
|
lyt
|
e742f17f74
|
Merge branch 'feature/plan-auto-send-Trippest'
|
7 years ago |
|
lyt
|
070869a620
|
去掉走团日期的查询条件,供应商平台默认是不勾选走团日期的
|
7 years ago |
|
lyt
|
cd627869be
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
lyt
|
aec661af43
|
Merge branch 'feature/trippest'
|
7 years ago |
|
lyt
|
f2f81d8ffa
|
同步订单不指定供应商id;原因:发送到图兰朵的计划,返回时操作部门没有正确设置,会导致重复
|
7 years ago |
|
cyc
|
172dcfc57c
|
修改cookie调用
|
7 years ago |
|
cyc
|
1a6a670c7f
|
修改遗漏cookie
|
7 years ago |
|
cyc
|
24f345b3c8
|
修改语法错误
|
7 years ago |
|
cyc
|
4b19c7194d
|
修改语法错误
|
7 years ago |
|
cyc
|
83ad7134c2
|
修改页面中调用cookie的地方
|
7 years ago |
|
cyc
|
5eed08993e
|
修改回调地址
|
7 years ago |
|
cyc
|
1d46973548
|
value 系统部署新的登录验证
|
7 years ago |
|
lyt
|
ef4404723c
|
Merge branch 'feature/plan-auto-send-Trippest'
|
7 years ago |
|
lyt
|
f7d5582c2d
|
返回成功给回执
|
7 years ago |
|
lyt
|
4bba9f3a00
|
Merge branch 'feature/plan-auto-send-Trippest'
|
7 years ago |
|
lyt
|
a19c382735
|
删除调试的日志输出
|
7 years ago |
|
lyt
|
b0ace1a79a
|
准备发送的计划:仅查询Trippest的团计划[未接收,未确认,未取消,未删除,未变更,已发送到供应商平台]
|
7 years ago |
|
lyt
|
b1ad61d8c6
|
更新仅Trippest计划发送
|
7 years ago |
|
lyt
|
81e2232698
|
删除原写入订单的代码;
|
7 years ago |
|
lyt
|
2925a16d08
|
代收团款填入: 结算团款,代收团款
|
7 years ago |
|
lyt
|
2d29fde054
|
用房标准填:入住人,入住日期;抵达/返程航车: 酒店(上/下车地点)中英文名称
|
7 years ago |
|
lyt
|
a74faf9e34
|
客人查询订单信息, 字符串编码修正
|
7 years ago |
|
lyt
|
2cd1e4d442
|
修改读取存储过程结果
|
7 years ago |
|
lyt
|
a95c277411
|
发送线路订单计划, 含测试输出
|
7 years ago |
|
lyt
|
00e75cee39
|
Merge branch 'feature/plan-auto-send-Trippest'
|
7 years ago |
|
lyt
|
fdde102b12
|
仅Trippest计划发送
|
7 years ago |
|
lyt
|
c34a4083e6
|
Trippest计划根据产品判断是否PVT
|
7 years ago |
|
lyt
|
10c54e3e04
|
Merge branch 'feature/trippest'
|
7 years ago |
|
lyt
|
736b5b6b04
|
Trippest同步:自营订单收款方不一致提示
|
7 years ago |
|
lyt
|
64b15017de
|
PayPal收款记录的客人名字字段
|
7 years ago |
|
lyt
|
1435e9f97e
|
PayPal detail优先IPN的结果>WH
|
7 years ago |
|
lyt
|
c8aac323fc
|
push tour 增加客人手机号
|
7 years ago |
|
lyt
|
35694a51af
|
测试push tour
|
7 years ago |
|
lyt
|
2fa7a57834
|
Merge branch 'feature/plan-auto-send-Trippest'
|
7 years ago |
|
lyt
|
e1113c1a0e
|
仅Trippest计划发送
|
7 years ago |
|
lyt
|
094424d6bc
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
lyt
|
5e2177f14b
|
修改ipaylinks通知记录的查询
|
7 years ago |
|
lyt
|
646578dc50
|
[测试]线路订单:不发送团款对象;不发送变更;
|
7 years ago |
尹诚诚
|
e8a6594d76
|
修复在线开机
|
7 years ago |
|
尹诚诚
|
9322a9fdb1
|
修复在线开机
|
7 years ago |
|
尹诚诚
|
046634e0aa
|
mycht搜索修复
|
7 years ago |
|
lyt
|
e065c87dcb
|
PayPal导出不含WH记录
|
7 years ago |
|
lyt
|
8f9888e609
|
修改ipaylinks通知记录的查询
|
7 years ago |
|
lyt
|
677fd65730
|
iPaylinks的APP组退款订单号处理
|
7 years ago |
|
lyt
|
a73ca7f7e2
|
修改信息上报调用供应商方法
|
7 years ago |
|
lyt
|
203a3842ec
|
全局变量:收款方:桂林海纳国旅
|
7 years ago |
|
lyt
|
bd5bbdf1ed
|
供应商方法移到libraries;团款和代收分别合并的修正;日志记录已发送的产品编号;
|
7 years ago |
|
lyt
|
322a2f0c3e
|
PayPal webhook没有付款人信息,先跳过
|
7 years ago |
|
lyt
|
689f6aa3b2
|
PayPal webhook没有付款人信息,先跳过
|
7 years ago |
|
lyt
|
ba3fe2686f
|
PayPal 修正退款变更发送状态后的查询条件
|
7 years ago |
|
lyt
|
6bac4d5e13
|
paypal note sort
|
7 years ago |
|
lyt
|
ef10c8c0e6
|
PayPal webhook录入但不重复发邮件
|
7 years ago |
|
lyt
|
ec5d45c245
|
PayPal webhook缺少付款人字段
|
7 years ago |
|
lyt
|
845ddde6a8
|
PayPal webhook 不发邮件
|
7 years ago |
|
lyt
|
d74aaff73d
|
PayPal webhook 不发邮件
|
7 years ago |
|
lyt
|
b003a18b23
|
iPaylinks的APP组退款订单号处理
|
7 years ago |
|
lyt
|
c32e6bf4a0
|
iPaylinks的APP组退款订单号处理
|
7 years ago |
|
lyt
|
995f0a8030
|
PayPal webhook 的时间处理
|
7 years ago |
|
lyt
|
cd67f710b1
|
PayPal 处理webhook
|
7 years ago |
|
lyt
|
aa2186d81a
|
paypal 接受webhook通知
|
7 years ago |
|
lyt
|
639add9ad0
|
paypal 接受webhook通知
|
7 years ago |
|
lyt
|
7a33f49a2c
|
测试PayPal webhook模拟器
|
7 years ago |
|
lyt
|
94fffeaf11
|
测试PayPal webhook模拟器
|
7 years ago |
|
lyt
|
1f5d2652ab
|
收款记录,代收团款记录:分别合并为一条
|
7 years ago |
|
lyt
|
9a98e63bb8
|
pvt团行程产品合并;代收金额记录;订单日志;订单备注
|
7 years ago |
|
lyt
|
75928b61cc
|
Trippest自动生成账单:删除今天的更新日期条件
|
7 years ago |
|
lyt
|
8f7044c9f0
|
Trippest自动生成:删除多余的日期条件
|
7 years ago |
|
lyt
|
8da48d9180
|
未完
|
7 years ago |
|
lyt
|
108541cbf6
|
Alipay获取对账单下载地址
|
7 years ago |
|
lyt
|
74ba1e1518
|
退款财务导出表增加交易平台列
|
7 years ago |
|
lyt
|
a2d7979498
|
APP组的后缀A
|
7 years ago |
|
lyt
|
8efad0335d
|
Merge branch 'feature/trippest'
|
7 years ago |
|
lyt
|
4f2a0869a7
|
fixed 拼团产品名中文字符bug
|
7 years ago |
|
lyt
|
d00b478958
|
测试账号
|
7 years ago |
|
lyt
|
61c69e15a6
|
Merge branch 'feature/trippest'
|
7 years ago |
|
lyt
|
1f33f5ddef
|
Trippest账单:删掉45天的查询条件
|
7 years ago |
|
lyt
|
9cd6562f37
|
Merge branch 'feature/trippest'
|
7 years ago |
|
lyt
|
0f1deb1ef0
|
Trippest自动生成账单
|
7 years ago |
|
lyt
|
94e2942154
|
传统团,没有联系人'
|
7 years ago |
|
lyt
|
0acf159b10
|
代码bug
|
7 years ago |
|
lyt
|
396304d313
|
代码bug
|
7 years ago |
|
lyt
|
0f4ff86099
|
Trippest的录入增加money字段
|
7 years ago |
|
lyt
|
61bc4f25b7
|
Trippest的录入增加money字段
|
7 years ago |
|
lyt
|
59ec3abc07
|
alipay 的退款号超长,截断
|
7 years ago |
|
lyt
|
5c852e0ae2
|
alipay 的退款号超长,截断
|
7 years ago |
|
lyt
|
2b3eee966f
|
商旅的收款记录, 美金金额写入GAI_Money, 所有支付方式
|
7 years ago |
|
lyt
|
9c29220522
|
商旅的收款记录, 美金金额写入GAI_Money, 所有支付方式
|
7 years ago |
|
lyt
|
236c318a95
|
商旅的收款记录, 美金金额写入GAI_Money, 所有支付方式
|
7 years ago |
|
lyt
|
409f889cbc
|
修正APP的订单号解析
|
7 years ago |
|
lyt
|
686d94b287
|
代码bug
|
7 years ago |
|
lyt
|
8b80b8e3e9
|
APP组的收款核对提醒, 用订单号和金额判断
不考虑订单多个收款的情况
如果收款记录是0条,则需要补充
|
7 years ago |
|
lyt
|
17ee96e325
|
退款的财务通知增加alipay
|
7 years ago |
|
lyt
|
2512a1df76
|
退款的财务邮件通知
|
7 years ago |
|
lyt
|
bad9e43339
|
测试退款的财务通知
|
7 years ago |
|
lyt
|
6fe0fdbadf
|
ipaylinks退款通知unsend
|
7 years ago |
|
lyt
|
a0216c12c8
|
退款判断是否要通知财务
|
7 years ago |
|
lyt
|
f0fd458f86
|
退款凭证:客人邮件的发送人名称修改
|
7 years ago |
|
lyt
|
91d3cb2934
|
iPaylinks 推送列表的发送状态显示;
|
7 years ago |
|
lyt
|
5f4c41fe30
|
退款处理
|
7 years ago |
|
lyt
|
27e616cb5a
|
merge feature-refund
|
7 years ago |
|
lyt
|
ce1dd3454c
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
lyt
|
d322fc2b22
|
异步通知未合并.隐藏多选的支付方式
|
7 years ago |
|
cyc
|
d7c18614e4
|
修改value系统
|
7 years ago |
|
cyc
|
3506581a54
|
修改value系统
|
7 years ago |
|
cyc
|
62f13bca2a
|
修改端口
|
7 years ago |
|
cyc
|
075cd9635f
|
修改邮件发送
|
7 years ago |
|
lyt
|
2c828c48df
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
cyc
|
9f0e967308
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
cyc
|
896cf8dc97
|
添加发送邮件站点
|
7 years ago |
|
lyt
|
74fa02151b
|
wxpay 配置文件
|
7 years ago |
|
lyt
|
b110df3fff
|
paypal Trippest
|
7 years ago |
|
lyt
|
08a2e3934a
|
Alipay 增加区分商旅APP和APP组
|
7 years ago |
|
lyt
|
355652d35e
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
lyt
|
c6341da623
|
Merge branch 'feature/pay'
|
7 years ago |
|
lyt
|
48a24c26b9
|
paypal APP组的收款提醒外联核对收款
|
7 years ago |
|
lyt
|
fa4f294cab
|
Alipay 退款处理;Note: 退款号32位, 超过GAI_AccreditNo的长度,录入和判断时截取, 备注完整.
|
7 years ago |
|
cyc
|
80dc193869
|
修改更换地址后产生的错误
|
7 years ago |
|
lyt
|
f6bdd4ae9b
|
Merge branch 'feature/pay'
|
7 years ago |
|
lyt
|
3714c7b225
|
上线144前, 无退款处理
|
7 years ago |
|
lyt
|
b4d5773dab
|
paypal,iPaylinks 推送列表的发送状态显示;
|
7 years ago |
|
lyt
|
b2be7d0214
|
iPaylinks 退款处理
|
7 years ago |
|
lyt
|
f17460389c
|
paypal 退款:区分商旅的APP和APP组的APP;退款邮件客人模板压缩
|
7 years ago |
|
cyc
|
7d9d6fa57f
|
TA采集和短信计费
|
7 years ago |
|
lyt
|
11f9e9967f
|
paypal 收款通知:邮件不重复发; 商旅新增的CHTAPP-biz需与APP组的订单区分
|
7 years ago |
|
lyt
|
1ce0e268df
|
config 增加Trippest站点;退款处理的客人邮件:+外联的签名
|
7 years ago |
|
lyt
|
cc7fc45dba
|
paypal 退款处理,通知客人
|
7 years ago |
|
lyt
|
91e472f21a
|
Merge branch 'feature/pay'
|
7 years ago |
|
lyt
|
434dccc50c
|
Alipay增加APP组的录入;传统订单收款记录支持更新实收金额
|
7 years ago |
|
cyc
|
6454733a9a
|
同步到144代码更新
|
7 years ago |
|
lyt
|
2665fcbdb9
|
paypal 退款:客人邮件模板
|
7 years ago |
|
lyt
|
d6d761bc4d
|
alipay 临时增加跨域, 迁移144后删除
|
7 years ago |
|
lyt
|
1173cc6c92
|
mark todo
|
7 years ago |
|
lyt
|
fafede57fc
|
同步:增加组团社错误的备注提示; 修正删除收款记录的类型[地接代收,地接社代收]
|
7 years ago |
|
lyt
|
47b2f0a7c7
|
merge master
|
7 years ago |
|
lyt
|
a93d4308d1
|
Trippest成本补充:增加report_tour:RPT_COLD_SN
|
7 years ago |
|
lyt
|
079ebd51da
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
7 years ago |
|
lyt
|
477fa683ed
|
从123搬迁的客户需求项目
|
7 years ago |
|
cyc
|
7b5ff8a08f
|
短信发送平台和订单来源查询系统
|
7 years ago |
|
lyt
|
56f28b6464
|
Merge branch 'feature/pay'
|
7 years ago |
|
lyt
|
ef7df56070
|
wxpay 新文件
|
7 years ago |
|
lyt
|
a66c1c6a89
|
Merge branch 'feature/pay'
|
7 years ago |
|
lyt
|
aecdf6eddf
|
wxpay 收款通知处理;收款通知列表;
|
7 years ago |
|
lyt
|
9cef2510b4
|
收款:外联邮件模板
|
7 years ago |
|
lyt
|
cf47bc32b9
|
paypal Trippest收款的录入状态查询
|
7 years ago |
|
lyt
|
8538378b43
|
wxpay 自动录入和发送提醒. 修复bug
|
7 years ago |
|
lyt
|
02b64c677e
|
Alipay 交易结束的处理bug
|
7 years ago |
|
lyt
|
21569e4da0
|
paypal Trippest收款的发送状态改到和失败一起处理,避免卡住其他发送失败的记录
|
7 years ago |
|
cyc
|
72ab473a8b
|
将值班系统和value系统。。从123搬迁到144
|
7 years ago |
|
lyt
|
5e1274f69f
|
Alipay收款码订单不收手续费
|
7 years ago |
|
lyt
|
bca4b6640a
|
Alipay 查询退款
|
7 years ago |
|
lyt
|
52839d2b9a
|
paypal Trippest站的收款在未找到订单时先邮件通知,以防止新订单邮件漏单
|
7 years ago |
|
lyt
|
43b9bf7205
|
wxpay 收款异步通知处理
|
7 years ago |
|
lyt
|
ab26a780cd
|
paypal Trippest收款的独立处理
|
7 years ago |
|
lyt
|
a93320bca0
|
paypal Trippest的收款自动录入订单
|
7 years ago |
|
lyt
|
a06156b1cb
|
paypal Trippest站的收款自动录入订单
|
7 years ago |
|
lyt
|
51a7f9ef47
|
wxpay 修改读取post数据的方法
|
7 years ago |
|
lyt
|
6456f898f3
|
Merge branch 'master' into feature/pay
|
7 years ago |
|
lyt
|
8ca66f997f
|
Alipay 状态:交易结束 自动处理
|
7 years ago |
|
lyt
|
0f955f66b6
|
日志
|
7 years ago |
|
lyt
|
fafa1ad017
|
Alipay 状态:交易结束
|
7 years ago |
|
lyt
|
6ce3c4b338
|
日志
|
7 years ago |
|
lyt
|
c25105bba8
|
退款处理30%
|
7 years ago |
|
lyt
|
d1b78f0c62
|
Trippest站点收款自动录入
|
7 years ago |
|
lyt
|
4abf1ae130
|
Merge branch 'feature/pay'
|
7 years ago |
|
lyt
|
df00c0823d
|
异步通知入口只能输出指定字符
|
7 years ago |
|
lyt
|
50222a91d2
|
merge master
|
7 years ago |
|
lyt
|
4decfcfae7
|
处理收到的收款推送,将各支付方式的处理方法合并. 20%
|
7 years ago |
|
lyt
|
43e9c8a68e
|
wxpay 异步通知处理:接收推送
|
7 years ago |
|
lyt
|
4ea5eb7147
|
alipay 增加交易号查询没有异步通知的收款(来自收钱码)
|
7 years ago |
|
lyt
|
9de1b5ae24
|
Trippest同步:支付方式使用地接社收款;修正订单来源类型
|
7 years ago |
|
lyt
|
1bc7843302
|
Trippest结算:总额/成本加上非包价产品金额, 重新计算利润和分成
|
7 years ago |
|
lyt
|
0e8277b136
|
Trippest结算:非包价产品总额改为计算当前指定供应商,并增加成本计算; 渠道订单改为地接社收款15020;
|
7 years ago |
|
lyt
|
6798355886
|
财务表 debug
|
7 years ago |
|
lyt
|
69876c2851
|
同步:COLD_PlanVEI_SN变更修正
|
7 years ago |
|
lyt
|
f90b0691af
|
Trippest 地接收款整理[未完]
|
7 years ago |
|
lyt
|
c87204653d
|
paypal 订单号匹配多条记录时,需手动请求录入,录入最佳匹配
|
7 years ago |
|
lyt
|
4ba0760466
|
sql bug
|
7 years ago |
|
lyt
|
fea962dd95
|
paypal note item_name长度250
|
7 years ago |
|
lyt
|
4f60ce7124
|
paypal 返回空
|
7 years ago |
|
lyt
|
fc97b0a1c5
|
Trippest客人查询信息页面:隐藏客人全名; *的重复次数bug
|
7 years ago |
|
lyt
|
a6371459f7
|
Trippest客人查询信息页面:隐藏客人全名
|
7 years ago |
|
lyt
|
c3bd8247b1
|
paypal note log
|
7 years ago |
|
lyt
|
bcfd3b3fcc
|
增加要求登录设置, 使用HT账号登录
|
7 years ago |
|
lyt
|
d5955d1299
|
收款记录页面以及相关的功能项增加要求登录设置
|
7 years ago |
|
lyt
|
fae01a2a0e
|
Trippest 账单结算表格:列出非包价产品且非指定供应商接待的报价总额, 不计入计算
|
7 years ago |
|
lyt
|
2b568e740a
|
Trippest 账单计算汇总表格: 地接选择输出
|
7 years ago |
|
lyt
|
e867d57e56
|
Trippest 账单结算汇总表格
|
7 years ago |
|
lyt
|
e14d7c2fa9
|
Alipay,Paypal,iPaylinks APP组的收款录入,相同金额还要检测付款方式
|
7 years ago |
|
lyt
|
08844a835b
|
Trippest 账单结算,未完成
|
7 years ago |
|
lyt
|
2168b91ffc
|
fixed notice
|
7 years ago |
|
lyt
|
e3d3ba3a52
|
paypal 导出表单的必填项修改
|
7 years ago |
|
lyt
|
e0399f409b
|
paypal 导出指定总金额的收款记录. 自动计算,完全匹配目标金额
|
7 years ago |
|
lyt
|
bc43f8d1e8
|
paypal 按金额导出收款记录,金额必填
|
7 years ago |
|
lyt
|
c8f0abfc6c
|
paypal 导出收款记录:增加记住每次导出的最后一条,指定总金额
|
7 years ago |
|
lyt
|
d08b32a8d5
|
Alipay 实收金额录入
|
7 years ago |