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

67 Commits

Author SHA1 Message Date
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
88470319f5 - systemd and ansbile files added. 2018-07-31 14:49:32 +08:00
gazebo
075e936dc0 - use actual price when creating waybill. 2018-07-31 09:57:30 +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
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
cbf72ac85d - fix early miscommit pendingOrderGapMax. 
- don't update order status when it's already finished.
 2018-07-28 22:20:24 +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
7ac054afed - fix bug in onWaybillNew, jd and elm self waybillID always as orderID 2018-07-27 15:06:51 +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
5f4af9ced0 - fixed some price bug. 2018-07-26 16:49:21 +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
33fb46040c - fixed get latest order status bug. 
- add GoodsOrder.VendorWaybillID.
 2018-07-26 09:38: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
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
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
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
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
gazebo
0cb34fe089 - all call CallFuncLogError add order info 
- callLegacyMsgHandler, callNewMsgHandler and generateLegacyJxOrder config
- call legacy lefted msg handler in new process(elm urge order and bad comment on jd)
 2018-07-22 13:45:16 +08:00
gazebo
dcdf432ac9 - change OrderCreatedAt to to purchase completed time, not start time. 2018-07-22 08:29:34 +08:00
gazebo
ae6198220c - min timeout scattered. 
- fix LoadPendingOrders bug when there is no waybill.
 2018-07-22 01:06:34 +08:00
gazebo
77c1dd07b5 - refactor 
- load pending orders, fixed bug.
 2018-07-22 00:19:38 +08:00
gazebo
1958f24705 - handle pending orders and waybills when starting. 2018-07-21 12:57:20 +08:00
gazebo
65eeef9966 - fix weixin push msg bug. 
- handle jd out-of-order msg.
 2018-07-20 23:22:31 +08:00
gazebo
da46c3396e - weixin msg added. 
- elm sometimes have no delivery msg
- elm sometimes delivery msg arrvied before finished pickup
- the gap between finished pickup and first delivery msg is big
 2018-07-20 18:10:14 +08:00
gazebo
486eee8bcd - don't treat no rows as error. 2018-07-19 22:15:13 +08:00
gazebo
fb2cd82e20 - move some funcs from controller to jxutils. 2018-07-19 21:20:18 +08:00
gazebo
680c0a0696 - fixed mtps fee cal bug. 2018-07-19 21:10:26 +08:00
gazebo
61157174e6 - fix mtps delivery fee bug. 2018-07-19 19:12:54 +08:00
gazebo
a56cb64f8e - delivery fee added. 
- fixed scheduler bug
 2018-07-19 18:05:40 +08:00
gazebo
3098740dce - bug fix. 2018-07-19 12:18:36 +08:00
gazebo
50a4a2a940 - fixed platform vendor id error when registering. 2018-07-18 23:23:42 +08:00