Commit Graph

240 Commits

Author SHA1 Message Date
gazebo
ef05d85fc2 - 梳理TIMER,去除TimerTypeBaseExpectedDeliveredTime 2019-03-31 15:46:41 +08:00
gazebo
d2fafe5ec0 - LimitUTF8StringLen 2019-03-31 12:13:47 +08:00
gazebo
12781c14be + 添加canOrderCreateWaybillNormally 2019-03-30 18:32:13 +08:00
gazebo
8ff383410b - 重构canOrderCreateWaybillNormally 2019-03-30 18:21:19 +08:00
gazebo
b9915b1116 - CreateWaybillOnProvider4SavedOrder to CreateWaybillOnProviders4SavedOrder 2019-03-30 17:14:34 +08:00
gazebo
96fb2d9535 - 重构createWaybillOn3rdProviders 2019-03-30 17:11:23 +08:00
gazebo
10a444c895 - 重构创建运单策略 2019-03-30 15:00:59 +08:00
gazebo
cd99fc3e14 - 对于饿百与美团外卖订单,设置其PickDeadline 2019-03-28 14:08:44 +08:00
gazebo
34edcda30c - fk 2019-03-28 13:40:47 +08:00
gazebo
ad2182f914 - 在mergeOrderStatusConfig要判断订单是否是真实订单 2019-03-28 12:51:17 +08:00
gazebo
bd93178f10 - fk 2019-03-28 12:45:30 +08:00
gazebo
920c67bb6f - 因为有些平台(比如美团外卖)的定时达单,很早就创建运单了,特殊处理平台的新运单事件
- 定时达创建三方运单的逻辑与之前的有变化
2019-03-28 12:26:53 +08:00
gazebo
77d6dce549 - 定时达的拣货完成定时器应该是TimerTypeBaseNow的 2019-03-27 16:34:16 +08:00
gazebo
9a89c596d4 - 处理自配送门店非立即达订单的发运单时间问题 2019-03-27 14:32:08 +08:00
gazebo
3380d6081a - SelfDeliverDelievered to SelfDeliverDelivered 2019-03-27 11:41:02 +08:00
gazebo
c173caaf6f - 设置美团外卖的自动拣货时间为4分钟 2019-03-25 12:04:46 +08:00
gazebo
a5788d5a7f - DefScheduler.IsOrderHasWaybill
- 手动创建运单时要判断订单是否已经有了有效的运单
- 手动取消运单时不做判断
2019-03-23 17:08:25 +08:00
gazebo
837395f431 - 自配送门店的PickupGoods不应调用平台相应API,模拟一个事件 2019-03-22 20:55:59 +08:00
gazebo
6cc6ee43bf - 自送订单不调用拣货完成API
- 在updateOrderStoreFeature中将order.DeliveryFlag落地
- 发送用户申请取消订单消息(当前只有饿百与京东有此事件)
2019-03-22 17:14:09 +08:00
gazebo
9d5db6cfc9 - globals init 2019-03-21 10:19:16 +08:00
gazebo
75406c8d49 - fix globals init bug 2019-03-21 09:15:06 +08:00
gazebo
4876b7664c - 新京东到家订单事件中,顺序调用得到新订单信息与手机号(因为超过了1000个店后,只用订单号查手机号要出错)
- 在defsch中异步调用微信发消息
2019-03-20 16:30:48 +08:00
gazebo
dec14126a7 - replace all goroutine and AfterFunc with recover version 2019-03-15 10:26:30 +08:00
gazebo
14a8c58239 - 处理同一运单重复接单情况 2019-03-13 15:22:18 +08:00
gazebo
517f42efcd - don't warning when got strange WaybillStatusAcceptCanceled if isPending in OnWaybillStatusChanged 2019-03-08 20:38:01 +08:00
gazebo
aef4ab7348 - don't output bill not exist info 2019-03-05 19:21:29 +08:00
gazebo
791c73612a - 临时处理达达平台消息错序情况 2019-03-05 14:20:06 +08:00
gazebo
10218a6d52 - 更新可能的运单状态变化在OnWaybillStatusChanged中 2019-03-05 09:10:24 +08:00
gazebo
9df6213532 - don't remove waybill when cancel it successfully. 2019-02-27 11:07:57 +08:00
gazebo
3ea347f25e - 订单取消时,取消所有运单 2019-02-21 11:23:09 +08:00
gazebo
c18a522132 - fix bug in updateBillsInfo 2019-02-19 12:10:53 +08:00
gazebo
9b9cade4ab - add updateBillsInfo to avoid possible warning 2019-02-19 09:43:20 +08:00
gazebo
7c8a3e7988 - up 2019-02-15 15:17:43 +08:00
gazebo
393a38192e - use GoodsOrder.PickDeadline to set auto pick timer, resetTimer 2019-02-15 15:15:11 +08:00
gazebo
ddbedfc680 - don't set OrderDeliveryFlagMaskPurcahseDisabled in DefScheduler.CreateWaybillOnProvidersEx 2019-02-14 14:40:29 +08:00
gazebo
26abd517f8 - don't judge DeliveryFlag in swtich2SelfDeliverWithRetry
- fix dada shop already exist error
2019-02-14 14:30:49 +08:00
gazebo
64d605d6e9 - fix bug in CreateWaybillOnProvidersEx and SelfDeliveringAndUpdateStatus 2019-02-14 12:30:36 +08:00
gazebo
65000be3d0 - remove enableStore and orderUseNewTable related stuff 2019-02-12 15:11:30 +08:00
gazebo
946164d138 - CreateWaybillOnProvidersEx use all possible courier vendor(not just MTPS). 2019-01-29 10:44:38 +08:00
gazebo
f2e8b48f8e - restore new weixin msg to on new order msg 2019-01-27 19:12:36 +08:00
gazebo
d6adfb23cc - fk 2019-01-25 15:28:06 +08:00
gazebo
a06c285c96 - fk 2019-01-25 15:26:14 +08:00
gazebo
66121f135e - fk 2019-01-25 14:50:09 +08:00
gazebo
a322256a44 - move NotifyNewOrder for OnOrderNew to handleAutoAcceptOrder(to avoid send auto rejected order) 2019-01-25 14:41:37 +08:00
gazebo
028fe25424 - DeliveryOrder in wsc 2019-01-25 10:59:10 +08:00
gazebo
8100e2be88 - add new order status OrderStatusWait4Pay
- handle weimob wsc order status OrderStatusWait4Pay
2019-01-25 09:14:40 +08:00
gazebo
bd92371e84 - wsc schedule. 2019-01-24 18:19:38 +08:00
gazebo
3a0f47790f - refactor order deliveryType 2019-01-23 18:31:34 +08:00
gazebo
d0bed4f40a - refactor GetJxStoreIDFromOrder
- add IsOrderPlatformWaybill
2019-01-22 10:19:37 +08:00
gazebo
b6f1dc8721 - GoodsOrder.ConsigneeMobile2 for real user mobile. 2019-01-08 18:21:50 +08:00