Commit Graph

213 Commits

Author SHA1 Message Date
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
45970ca08b - backup when copy files to remote to deploy. 2018-07-31 15:59:18 +08:00
gazebo
c7f35cd6a3 - rumode. 2018-07-31 15:25:00 +08:00
gazebo
85b7fcc05f - fix conf/app.conf 2018-07-31 15:22:50 +08:00
gazebo
01414c91b5 - fk. 2018-07-31 15:03:54 +08:00
gazebo
1af867bd0f - ansible.yml 2018-07-31 15:00:57 +08:00
gazebo
6085f900e2 - hosts variable in ansible.yml 2018-07-31 14:59:18 +08:00
gazebo
88470319f5 - systemd and ansbile files added. 2018-07-31 14:49:32 +08:00
gazebo
b8cef23e9b - OrderStatusNew and OrderStatusFinishedPickup timer type changed to TimerTypeBaseStatusTime. 2018-07-31 10:21:25 +08:00
gazebo
075e936dc0 - use actual price when creating waybill. 2018-07-31 09:57:30 +08:00
gazebo
a83e17dd34 - fixed not initialize waybills in WatchOrderInfo. 2018-07-31 09:33:48 +08:00
gazebo
8496a745c0 - don't use func init() in main.go 2018-07-31 09:03:37 +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
0615758d9a - limit mtps max addfee to 200. 2018-07-30 17:45:38 +08:00
gazebo
a7d63caf08 - limit dada cargoprice to 63.99 2018-07-30 16:28:25 +08:00
gazebo
0464042d49 - comment modified for elm order price info. 2018-07-30 14:48:16 +08:00
gazebo
f4237b1541 - change dada key to xjh. 2018-07-30 12:17:43 +08:00
gazebo
7fae4dd52a - renmae PickedUpGoods to PickupGoods. 2018-07-30 07:58:43 +08:00
gazebo
5c4d34554f - build version, git info added. 2018-07-29 20:43:25 +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
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