liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
222 Commits 4 Branches 0 Tags
91e4638b70c27dc3cc27528cbc0148cd862e3099
Commit Graph

77 Commits

Author SHA1 Message Date
gazebo
fbef61c768 - add remark in orderstatus table. 
- check order.waybill vendor id in swtich2SelfDeliverWithRetry.
 2018-08-02 18:07:54 +08:00
gazebo
ba98cf1e27 - don't treat multiple accept as warning. 
- every time jd dada create new bill, must wait some time.
 2018-08-02 17:12:35 +08:00
gazebo
02e50139e0 - allow create waybill in delivering status. 2018-08-02 12:09:50 +08:00
gazebo
0d759218c1 - write important error msg to db. 2018-08-02 09:24:18 +08:00
gazebo
f0ea5f1186 - pickup error as info. 2018-08-01 17:55:01 +08:00
gazebo
ab6efb48ab - waybill retry count set to 3. 2018-08-01 15:30:43 +08:00
gazebo
9fd340abfa - handle mtps create waybill error. 
- log accept or decline order error with info level.
 2018-08-01 12:13:27 +08:00
gazebo
95e27e6803 - fix bug, calling resetTimer should give correct isPending. 2018-08-01 10:38:45 +08:00
gazebo
cd3a4b651a - change jx-callback.service Requires MySQL to Wants MySQL. 
- don't treat CreateWaybill fail as warning.
 2018-08-01 10:23:59 +08:00
gazebo
7afa99620a - add poi_seq when creating mtps waybill. 
- cancel waybill in new msg when order status already end.
 2018-07-31 20:29:55 +08:00
gazebo
4fd0e8d359 - bug output warning in addWaybill2Map fixed(reversed). 2018-07-31 16:21:56 +08:00
gazebo
b8cef23e9b - OrderStatusNew and OrderStatusFinishedPickup timer type changed to TimerTypeBaseStatusTime. 2018-07-31 10:21:25 +08:00
gazebo
a83e17dd34 - fixed not initialize waybills in WatchOrderInfo. 2018-07-31 09:33:48 +08:00
gazebo
16db9af499 - change savedwaybill2map. 2018-07-30 23:10:33 +08:00
gazebo
2933392731 - retry logic in swtich2SelfDeliverWithRetry implemented. 
- when WaybillStatusCanceled received, will create new waybill when order.WaybillVendorID is unknown.
- don't treat mtps exception msg as failed.
- when waybill delivered msg received, set order delivered anyway.
 2018-07-30 21:02:16 +08:00
gazebo
7fae4dd52a - renmae PickedUpGoods to PickupGoods. 2018-07-30 07:58:43 +08:00
gazebo
58e91a8f5c - avoid duplicaated sku name when creating mtps bill. 2018-07-29 17:08:42 +08:00
gazebo
2dab1637fe - don't call SelfDeliverDelievering when waybill delivering msg came. 2018-07-28 22:40:49 +08:00
gazebo
cbf72ac85d - fix early miscommit pendingOrderGapMax. 
- don't update order status when it's already finished.
 2018-07-28 22:20:24 +08:00
gazebo
ecdf2af63c - dont' create 3rd waybill when purchase platfrom waybill canceled. 2018-07-28 14:45:16 +08:00
gazebo
7734399392 - elm self delivery support. 2018-07-28 12:03:21 +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
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
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
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
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
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
de21819f71 - refactor model register. 2018-07-24 09:46:30 +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