Commit Graph

185 Commits

Author SHA1 Message Date
gazebo
ecdf2af63c - dont' create 3rd waybill when purchase platfrom waybill canceled. 2018-07-28 14:45:16 +08:00
gazebo
5bcd49c1fa - scatter pending order when starting up(avoid access db simultaneously). 2018-07-28 13:15:15 +08:00
gazebo
7734399392 - elm self delivery support. 2018-07-28 12:03:21 +08:00
gazebo
ad93408e4c - change elm autoaccept delay to 270 seconds. 2018-07-27 17:01:17 +08:00
gazebo
f98e26fb0a - purchase platform waybill has highest priority.
- CancelWaybill in Swtich2SelfDeliver should update order waybill state.
2018-07-27 15:33:21 +08:00
gazebo
7ac054afed - fix bug in onWaybillNew, jd and elm self waybillID always as orderID 2018-07-27 15:06:51 +08:00
gazebo
be1ee10fe6 - add debug info. 2018-07-27 12:31:25 +08:00
gazebo
cdaae1c1fa - handle isPending in OnWaybillStatusChanged. 2018-07-26 22:28:36 +08:00
gazebo
96912cdcb9 - waybillStatus.Status > model.WaybillStatusUnknown in OnWaybillStatusChanged and OnOrderStatusChanged. 2018-07-26 21:27:01 +08:00
gazebo
d4ce33007b - don't revert status when already finished. 2018-07-26 19:20:52 +08:00
gazebo
a97f0c8251 - bug fix. 2018-07-26 18:08:13 +08:00
gazebo
78e8c79e8a - bug fix. 2018-07-26 18:02:20 +08:00
gazebo
d9ae588979 - bug fix 2018-07-26 17:55:02 +08:00
gazebo
81752da82d - disable cancelwaybill
- autopickup use jxstorefeature.
2018-07-26 17:39:03 +08:00
gazebo
1b9e1a50d6 - fix state machine bug. 2018-07-26 17:21:58 +08:00
gazebo
5f4af9ced0 - fixed some price bug. 2018-07-26 16:49:21 +08:00
gazebo
11db08e4c3 - change OrderStatusAccepted timer type to TimerTypeBaseExpectedDeliveredTime. 2018-07-26 15:32:20 +08:00
gazebo
157ddbe590 - fix resetTimer error. 2018-07-26 14:31:20 +08:00
gazebo
2b481691bf - timer changed (TimerTypeBaseExpectedDeliveredTime). 2018-07-26 14:08:28 +08:00
gazebo
925fe454ac - fk. 2018-07-26 11:32:54 +08:00
gazebo
1e3cbbec50 - add OrderStatusFinishedPickup in legacyMapOrderStatus. 2018-07-26 11:16:25 +08:00
gazebo
6e0d896d24 - don't verify order status when waybill message comes(because events may out of order). 2018-07-26 10:49:52 +08:00
gazebo
a5725533e6 - fixed bug in updateOrderByBill, not updating order.VendorWaybillID. 2018-07-26 10:15:26 +08:00
gazebo
8aa1ed3d71 - debug. 2018-07-26 10:10:55 +08:00
gazebo
33fb46040c - fixed get latest order status bug.
- add GoodsOrder.VendorWaybillID.
2018-07-26 09:38:21 +08:00
gazebo
9a68ad0f39 - u 2018-07-25 23:23:21 +08:00
gazebo
155c336f44 - fixed crash bug caused by misuse order(should use status). 2018-07-25 23:07:17 +08:00
gazebo
a8c2e9991b - pending order use real status when calling scheduler.OnOrderNew.
- set the order status to the proper value when there is a early message camme(saveOrder).
2018-07-25 22:58:19 +08:00
gazebo
c0770e9ab5 - big refactor for scheduler. 2018-07-25 20:43:41 +08:00
gazebo
f3df85c8e0 - fixed load pending orders. 2018-07-25 11:19:23 +08:00
gazebo
38dc61a0bc - tt. 2018-07-24 18:00:35 +08:00
gazebo
2a438e8eb6 - temp fix 2018-07-24 17:45:11 +08:00
gazebo
538781a504 - ignore OrderStatusFinishedPickup. 2018-07-24 17:33:15 +08:00
gazebo
288871a64a - bug fix. 2018-07-24 16:41:07 +08:00
gazebo
2c0d3555a4 - add debug info. 2018-07-24 16:22:32 +08:00
gazebo
ca9bf8f0a3 没有显示处理model.WaybillStatusCourierArrived事件,导致TIMER没有停掉,又执行了在第3方门店创建运单操作。(改为只要收到了大于NEW的运单事件,都将TIMER停掉,状态需要添加TIMER的,再自行添加)
然后createWaybillOn3rdProviders又没有判断状态,导致又重新创建运单(添加状态判断,另外将所有TIMER事件中的逻辑都添加状态判断,合适后才真正执行)
2018-07-24 15:50:24 +08:00
gazebo
a5baa5c46e - treat jdapi.OrderStatusAdjust as model.OrderStatusNew. 2018-07-24 13:33:01 +08:00
gazebo
833f00b2de - fix initialize order bug. ReallyCallPlatformAPI not initialized properly. 2018-07-24 11:06:50 +08:00
gazebo
a9a37ac278 - treat OrderStatusPurchased as new 2018-07-24 10:07:50 +08:00
gazebo
de21819f71 - refactor model register. 2018-07-24 09:46:30 +08:00
gazebo
3439ef3669 - callLegacyMsgHandler = false. 2018-07-24 09:28:02 +08:00
gazebo
e23223ed32 - don't call InitOrder when not calling legacy handler. 2018-07-23 22:28:52 +08:00
gazebo
acfe64c200 - register model.Jxstorefeature. 2018-07-23 18:47:39 +08:00
gazebo
857f2cae45 - jxstorefeature support added. 2018-07-23 18:35:48 +08:00
gazebo
479ce46200 - fixed a bug in defsch.init, replace LoadOrder with GetOrder.
- dynamic table name for legacy order related table.
2018-07-23 17:30:22 +08:00
gazebo
96d8e7b2fa - add HEAD / to make uptime happy. 2018-07-22 23:36:24 +08:00
gazebo
818856a5ed - fixed bug wrong use orderid ref in loadSavedOrderFromMap. 2018-07-22 23:26:45 +08:00
gazebo
ae214d38b9 - timer task shceuled to order goroutine to avoid concurrent problem. 2018-07-22 23:11:20 +08:00
gazebo
52ac5ca64a - save real order status when new order msg came. 2018-07-22 21:57:56 +08:00
gazebo
7ae0944fc9 - log msg refactor, add orderID to all logs. 2018-07-22 16:44:44 +08:00