liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,271 Commits 4 Branches 0 Tags
88c1aa2e5eb4cd22f19db7c12a7a050a6b09ae7d
Commit Graph

8387 Commits

Author SHA1 Message Date
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
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
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
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
b9e59e1197 - set dynamic token when starting up. 2018-07-21 14:17:48 +08:00
gazebo
260453be69 - RefreshWeixinToken and RefreshElmToken firs time run must completed before main workflow going. 2018-07-21 13:30:43 +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
6f0d27e54d - fix weixin bug. 2018-07-20 20:36:34 +08:00
gazebo
40aa67546c - send weixin msg to me. 2018-07-20 18:39:26 +08:00
gazebo
6ec928611d - avoid openid is null. 2018-07-20 18:21:10 +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
cb6fd8b850 - avoid savedOrderInfo is nil. 
- change conf.
 2018-07-19 22:06:10 +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