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

94 Commits

Author SHA1 Message Date
gazebo
ff1d223933 - don't cancel master waybill when received order delivered msg. 2018-08-13 11:59:07 +08:00
gazebo
41d2d4bce9 - Info to Infof. 2018-08-13 11:34:34 +08:00
gazebo
ef78e9f64b - it's normal when order finished mesg comes before purchase platform waybill delivered msg. 2018-08-13 09:05:29 +08:00
gazebo
f5f3805470 - send weixin msg more accurately. 2018-08-11 16:37:16 +08:00
gazebo
c3b5e669d4 - savedOrderInfo.retryCount++ only when actually created at least one waybill. 2018-08-10 16:38:52 +08:00
gazebo
dd9afa4248 - handle ShopPrice. 2018-08-10 15:21:33 +08:00
gazebo
ca40c54080 - change Warnf to Infof in model.WaybillStatusFailed. 2018-08-09 09:35:01 +08:00
gazebo
702aac1b00 - change several abnormal case caused by out of order msg to Infof. 2018-08-08 14:03:49 +08:00
gazebo
d0ed9cae4f - record cancel reason for dada. 
- revert Infof to Warnf when WaybillStatusFailed.
 2018-08-07 11:24:34 +08:00
gazebo
d3f4b0079f - change Warnf to Infof in WaybillStatusFailed. 2018-08-07 11:18:24 +08:00
gazebo
460c4ab45b - treat purchase platform waybill come later as normal. 818810379000941 2018-08-06 17:40:24 +08:00
gazebo
afe31e0db7 - reorganize purchase platform interface, split Swith2SelfDeliver and SelfDelivery. 2018-08-04 23:08:16 +08:00
gazebo
9d40bbc85b - handle OnWaybillStatusChanged Delivered order(%d, %s) bill(%d, %s), bill:%v shouldn't get here. 
- 1223633660228537567
 2018-08-04 20:39:37 +08:00
gazebo
7e6293f514 - fix comment. 2018-08-03 17:54:01 +08:00
gazebo
4862649d77 - handle exceptional msg(e.g. userapplycancel, lock, unlock). 2018-08-03 15:55:00 +08:00
gazebo
886d2b1f15 - OrderStatusFinishedPickup can call SelfDeliverDelievered. 2018-08-03 12:44:23 +08:00
gazebo
edd934233f - enable dada. 2018-08-03 11:38:57 +08:00
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