LiaoYijun
|
0cf26c5600
|
完成 PayPal、微信、支付宝收款审核提示
|
4 years ago |
cyc
|
8d51f6f07f
|
修改接口
|
5 years ago |
ycc
|
5dd6b3c934
|
更新工信部链接
|
5 years ago |
lyt
|
d915cf82a2
|
Merge branch 'feature/pay'
|
5 years ago |
|
lyt
|
df891694ba
|
fix: 中文
|
5 years ago |
|
lyt
|
1e66f29570
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
2f1a47fd06
|
PayPal导出明细, 修复指定日期无记录导致终止
|
6 years ago |
|
lyt
|
506c7efa14
|
Merge branch 'feature/new-merge-payment'
|
6 years ago |
|
lyt
|
79fc984f9f
|
feat: iPaylinks日账单下载执行时长
|
6 years ago |
|
lyt
|
e135f5d8b7
|
Merge branch 'feature/new-merge-payment'
|
6 years ago |
|
lyt
|
d660e1da29
|
fix: 修正在线支付统计的部分数据缺失导致表记录未合并; 更改退款通知收件人
|
6 years ago |
|
lyt
|
36ae3e5b0e
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
174b931e01
|
fix: 图兰朵同步订单的地接确认状态
|
6 years ago |
|
lyt
|
53062dd828
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
414e40dcb0
|
feat: 综费订单账单团款>0
|
6 years ago |
|
lyt
|
67e937d02c
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
07e2230454
|
feat: 账单预审核增加显示结算协议异常
|
6 years ago |
|
lyt
|
9084522b8d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
733012678c
|
fix: 地接已取消的团, HT数据已设为无效
|
6 years ago |
|
lyt
|
943d664f59
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
dc66ff5613
|
fix: 地接已取消的团, HT数据已设为无效
|
6 years ago |
|
lyt
|
6742e49f98
|
feat: test curl TLS version
|
6 years ago |
|
lyt
|
c9289e901f
|
Merge branch 'feature/new-merge-payment'
|
6 years ago |
|
lyt
|
38a5438585
|
feat: iPaylinks日账单
|
6 years ago |
|
lyt
|
01b5138820
|
Merge branch 'feature/new-merge-payment'
|
6 years ago |
|
lyt
|
09ee6e0b1a
|
feat: 在线支付汇总增加合计计算; 修改查询计算避免计算数据缺失
|
6 years ago |
|
lyt
|
bd3a95c3ec
|
Merge branch 'feature/new-merge-payment'
|
6 years ago |
|
lyt
|
49a0d08bee
|
fix: 天数计算和日期范围
|
6 years ago |
|
lyt
|
399309d3fb
|
Merge branch 'feature/new-merge-payment' into feature/pay
|
6 years ago |
|
lyt
|
4a6b8bcecb
|
Merge branch 'feature/new-merge-payment'
|
6 years ago |
|
lyt
|
d868b371c3
|
feat: 在线支付记录合并; 汇总统计;
|
6 years ago |
|
lyt
|
5903a15100
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
9a572efd39
|
fix: PayPal导出外管局明细, 总金额不足
|
6 years ago |
|
cyc
|
ea7098f24d
|
修改地址
|
6 years ago |
|
cyc
|
4ef90c5e04
|
重新调整发送程序
|
6 years ago |
|
cyc
|
3155196b14
|
修改发送邮件程序
|
6 years ago |
|
cyc
|
c2714eaffb
|
修改邮件到达地址
|
6 years ago |
|
cyc
|
d7b2b944a5
|
修改post方式
|
6 years ago |
|
cyc
|
0b5fd5bddb
|
修改url格式
|
6 years ago |
|
cyc
|
1ea86e41e9
|
修改程序
|
6 years ago |
|
cyc
|
40c81f3c49
|
修改程序
|
6 years ago |
|
cyc
|
0267cb8562
|
修改发送邮件程序
|
6 years ago |
|
cyc
|
8968b1c719
|
修改邮件发送程序
|
6 years ago |
|
cyc
|
2ad7617dcd
|
修改配置
|
6 years ago |
|
cyc
|
3586fd2c63
|
修改value邮件发送方法
|
6 years ago |
|
cyc
|
f99760abf6
|
修改头部版本号
|
6 years ago |
|
lyt
|
798cfd14b6
|
feat: 列表查询筛选条件
|
6 years ago |
|
lyt
|
4924414257
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
cc2c522cb1
|
style
|
6 years ago |
|
lyt
|
b55aa64dbb
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
6310ffb617
|
fix: 计算综费结算金额
|
6 years ago |
|
lyt
|
fe847b0edd
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
adbca8bc96
|
fix: 自动审核团款: 不含cancel,计算综费结算金额
|
6 years ago |
|
lyt
|
c31e1bec9f
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
d52c9d7d12
|
feat: 图兰朵删除目的地城市字段
|
6 years ago |
|
lyt
|
a602a2a3a4
|
feat: 解析录入iPaylinks对账单到OPN; 查询列表支持其他方式
|
6 years ago |
|
lyt
|
9232f7a5df
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
eab7fbd67c
|
feat: 修改地接对应协议部门
|
6 years ago |
|
lyt
|
af399af4ae
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
950047089e
|
feat: 修改地接计调负责人
|
6 years ago |
|
lyt
|
242bab453d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
c9e7e4a1ab
|
Trippest账单自动审核:不含综费结算(先使用地接数据);预审核显示取消团未审核数据
|
6 years ago |
|
cyc
|
089f1aeded
|
审批新增两个字段
|
6 years ago |
|
lyt
|
1adfb21b87
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
3567cb22ca
|
fix: 图兰朵更改字段值
|
6 years ago |
|
lyt
|
b40013c003
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
5c41ac5817
|
feat: Trippest预审核的时效
|
6 years ago |
|
lyt
|
b4030d80ea
|
断电前提交
|
6 years ago |
|
lyt
|
47bb503cbf
|
todo: iPaylinks账单数据录入
|
6 years ago |
|
lyt
|
9be8b3d126
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
32bf3e0211
|
feat: WeChat增加退款关联id
|
6 years ago |
|
lyt
|
f13d24553d
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
bbed70cd89
|
fix: Alipay录入状态
|
6 years ago |
|
cyc
|
15e375cf2b
|
修改sql语句
|
6 years ago |
|
cyc
|
a0a4dfdef2
|
修改sql错误
|
6 years ago |
|
cyc
|
b413b1b70b
|
添加字段
|
6 years ago |
|
cyc
|
ef152492db
|
删除测试代码
|
6 years ago |
|
cyc
|
8a2d56d18d
|
修改字段
|
6 years ago |
|
cyc
|
aa81bada19
|
添加审批记录到数据库
|
6 years ago |
|
cyc
|
66d50aebf9
|
转发回调信息
|
6 years ago |
|
lyt
|
84d784b0ac
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
96d11d5e2c
|
feat: PayPal APP组的设置订单号仍推送APP, 不支持转交收款
|
6 years ago |
|
lyt
|
6bff8d69cb
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
4041ee57f7
|
feat:PayPal查看录入状态增加APP的Memo字段交易号
|
6 years ago |
|
lyt
|
5ad2c8314c
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
adeb0dcaf3
|
feat:PayPal查看录入状态增加APP的Memo字段交易号
|
6 years ago |
|
lyt
|
70b7c4693e
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
bfa6649d5e
|
feat: PayPal退款邮件收件人改为PayPal账户邮件
|
6 years ago |
|
lyt
|
c160621a90
|
feat: PayPal显示发送状态
|
6 years ago |
|
lyt
|
28eea2a4c7
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
54114feda9
|
.
|
6 years ago |
|
lyt
|
31cdd8cd24
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
dd7a4b317f
|
feat: 明细使用同步回来的数据“
”
|
6 years ago |
|
cyc
|
b330e53d01
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
cyc
|
1c3e19f1af
|
部署钉钉验证库
|
6 years ago |
|
lyt
|
f3949e096b
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
317ed34d1f
|
feat: 收款按照收款方字段；注释“
|
6 years ago |
|
cyc
|
fc5300cc64
|
接收回调
|
6 years ago |
|
lyt
|
d0775d1676
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
ba60dd58b7
|
feat: Trippest预审核: 增加HT实收金额错误提示
|
6 years ago |
|
lyt
|
f9b285ef63
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
lyt
|
862c859af1
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
81fb2dbcba
|
fix
|
6 years ago |
|
cyc
|
ffd18182c6
|
Merge branch 'master' of gitee.com:hainatravel/information-system
|
6 years ago |
|
cyc
|
73a554defa
|
修改接收回调
|
6 years ago |
|
lyt
|
024e3cf4f1
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
d6b07cd425
|
feat: Trippest支持酒店
|
6 years ago |
|
lyt
|
228ee42ef4
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
215575ad59
|
feat: 预审核增加更新数据
|
6 years ago |
|
lyt
|
16ab3a122d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
80a397afcb
|
fix: Trippest 同步订单的状态更新
|
6 years ago |
|
cyc
|
d2497d51e3
|
添加回调
|
6 years ago |
|
lyt
|
22e8d6fe4e
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
de9ec9ee90
|
fix: PayPal set invoice
|
6 years ago |
|
lyt
|
6b9c8f1324
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
0e86157c80
|
feat: PayPal APP组的IPN通知转发
|
6 years ago |
|
lyt
|
244488db18
|
feat: PayPal APP组的IPN通知转发
|
6 years ago |
|
lyt
|
d712319653
|
fix: report tour: tourProvider
|
6 years ago |
|
lyt
|
79de9c2fc2
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
9b48d400af
|
fix: 修改同步订单取消的状态
|
6 years ago |
|
lyt
|
bfe01dbf36
|
Merge branch 'feature/plan-auto-send-release'
|
6 years ago |
|
lyt
|
e572952107
|
fix: Trippest团的报价币种
|
6 years ago |
|
lyt
|
6f6552666d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
0f88a69652
|
feat: 列出未更新的数据
|
6 years ago |
|
lyt
|
75eb7e5990
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
636dd4bed8
|
fix: 海纳report_tour tour_cost sum by vendor
|
6 years ago |
|
lyt
|
a79cfc7109
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
2d10c6aafd
|
fix: 财务表成本和实际成本,排除设为无效的团
|
6 years ago |
|
lyt
|
07091fe3f5
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
0166e701fc
|
feat: PayPal增加显示留言,备注
|
6 years ago |
|
lyt
|
2cdd2da50d
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
45958aa271
|
feat: 预审核提示
|
6 years ago |
|
lyt
|
4c86c71d73
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
6704ea9dfd
|
feat: 预审核提示
|
6 years ago |
|
lyt
|
de2031e472
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
5bc0c6525a
|
feat: 自动更新成本总额和账单不一致的团成本
|
6 years ago |
|
lyt
|
bd9bdba994
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
996f76f6de
|
feat: 自动更新成本排除已审核的团
|
6 years ago |
|
lyt
|
ec1abbac48
|
feat: Trippest账单,自动更新
|
6 years ago |
|
lyt
|
3face9b8e4
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
7f690b7dfe
|
删除report_tour相同的cold_sn
|
6 years ago |
|
lyt
|
73357c9065
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
a5841a4854
|
财务表成本数据注释
|
6 years ago |
|
lyt
|
15f24f9862
|
Merge branch 'feature/trippest'
|
6 years ago |
|
lyt
|
e7668536c1
|
feat: 构建同步数据的汇总表, 和图兰朵财务完全一致
|
6 years ago |
|
lyt
|
43a810d143
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
6d38dd790e
|
fix: APP 组PayPal
|
6 years ago |
|
lyt
|
14c1417038
|
Merge branch 'feature/pay'
|
6 years ago |
|
lyt
|
9824d959ea
|
fix: APP组PayPal收款
|
6 years ago |
|
lyt
|
6ddeca772b
|
Merge branch 'feature/pay'
|
6 years ago |