liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • f4237b1541 - change dada key to xjh. gazebo 2018-07-30 12:17:43 +08:00
  • 7fae4dd52a - renmae PickedUpGoods to PickupGoods. gazebo 2018-07-30 07:58:43 +08:00
  • 5c4d34554f - build version, git info added. gazebo 2018-07-29 20:43:25 +08:00
  • 58e91a8f5c - avoid duplicaated sku name when creating mtps bill. gazebo 2018-07-29 17:08:42 +08:00
  • 2dab1637fe - don't call SelfDeliverDelievering when waybill delivering msg came. gazebo 2018-07-28 22:40:49 +08:00
  • cbf72ac85d - fix early miscommit pendingOrderGapMax. - don't update order status when it's already finished. gazebo 2018-07-28 22:20:24 +08:00
  • ecdf2af63c - dont' create 3rd waybill when purchase platfrom waybill canceled. gazebo 2018-07-28 14:45:16 +08:00
  • 5bcd49c1fa - scatter pending order when starting up(avoid access db simultaneously). gazebo 2018-07-28 13:15:15 +08:00
  • 7734399392 - elm self delivery support. gazebo 2018-07-28 11:49:54 +08:00
  • ad93408e4c - change elm autoaccept delay to 270 seconds. gazebo 2018-07-27 17:01:17 +08:00
  • f98e26fb0a - purchase platform waybill has highest priority. - CancelWaybill in Swtich2SelfDeliver should update order waybill state. gazebo 2018-07-27 15:31:24 +08:00
  • 7ac054afed - fix bug in onWaybillNew, jd and elm self waybillID always as orderID gazebo 2018-07-27 15:06:51 +08:00
  • be1ee10fe6 - add debug info. gazebo 2018-07-27 12:31:25 +08:00
  • cdaae1c1fa - handle isPending in OnWaybillStatusChanged. gazebo 2018-07-26 22:28:36 +08:00
  • 96912cdcb9 - waybillStatus.Status > model.WaybillStatusUnknown in OnWaybillStatusChanged and OnOrderStatusChanged. gazebo 2018-07-26 21:27:01 +08:00
  • d4ce33007b - don't revert status when already finished. gazebo 2018-07-26 19:20:52 +08:00
  • a97f0c8251 - bug fix. gazebo 2018-07-26 18:08:13 +08:00
  • 78e8c79e8a - bug fix. gazebo 2018-07-26 18:02:20 +08:00
  • d9ae588979 - bug fix gazebo 2018-07-26 17:55:02 +08:00
  • 81752da82d - disable cancelwaybill - autopickup use jxstorefeature. gazebo 2018-07-26 17:39:03 +08:00
  • 1b9e1a50d6 - fix state machine bug. gazebo 2018-07-26 17:21:58 +08:00
  • 5f4af9ced0 - fixed some price bug. gazebo 2018-07-26 16:49:21 +08:00
  • 11db08e4c3 - change OrderStatusAccepted timer type to TimerTypeBaseExpectedDeliveredTime. gazebo 2018-07-26 15:32:20 +08:00
  • 157ddbe590 - fix resetTimer error. gazebo 2018-07-26 14:31:20 +08:00
  • 2b481691bf - timer changed (TimerTypeBaseExpectedDeliveredTime). gazebo 2018-07-26 14:08:28 +08:00
  • 925fe454ac - fk. gazebo 2018-07-26 11:32:54 +08:00
  • 1e3cbbec50 - add OrderStatusFinishedPickup in legacyMapOrderStatus. gazebo 2018-07-26 11:16:25 +08:00
  • 6e0d896d24 - don't verify order status when waybill message comes(because events may out of order). gazebo 2018-07-26 10:49:52 +08:00
  • a5725533e6 - fixed bug in updateOrderByBill, not updating order.VendorWaybillID. gazebo 2018-07-26 10:15:26 +08:00
  • 8aa1ed3d71 - debug. gazebo 2018-07-26 10:10:55 +08:00
  • 33fb46040c - fixed get latest order status bug. - add GoodsOrder.VendorWaybillID. gazebo 2018-07-26 09:38:21 +08:00
  • 9a68ad0f39 - u gazebo 2018-07-25 23:23:21 +08:00
  • 155c336f44 - fixed crash bug caused by misuse order(should use status). gazebo 2018-07-25 23:07:17 +08:00
  • 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). gazebo 2018-07-25 22:58:19 +08:00
  • c0770e9ab5 - big refactor for scheduler. gazebo 2018-07-25 20:43:41 +08:00
  • f3df85c8e0 - fixed load pending orders. gazebo 2018-07-25 11:19:23 +08:00
  • 38dc61a0bc - tt. gazebo 2018-07-24 18:00:35 +08:00
  • 2a438e8eb6 - temp fix gazebo 2018-07-24 17:45:11 +08:00
  • 538781a504 - ignore OrderStatusFinishedPickup. gazebo 2018-07-24 17:33:15 +08:00
  • 288871a64a - bug fix. gazebo 2018-07-24 16:41:07 +08:00
  • 2c0d3555a4 - add debug info. gazebo 2018-07-24 16:22:32 +08:00
  • ca9bf8f0a3 没有显示处理model.WaybillStatusCourierArrived事件，导致TIMER没有停掉，又执行了在第3方门店创建运单操作。（改为只要收到了大于NEW的运单事件，都将TIMER停掉，状态需要添加TIMER的，再自行添加） 然后createWaybillOn3rdProviders又没有判断状态，导致又重新创建运单（添加状态判断，另外将所有TIMER事件中的逻辑都添加状态判断，合适后才真正执行） gazebo 2018-07-24 15:50:24 +08:00
  • a5baa5c46e - treat jdapi.OrderStatusAdjust as model.OrderStatusNew. gazebo 2018-07-24 13:33:01 +08:00
  • 833f00b2de - fix initialize order bug. ReallyCallPlatformAPI not initialized properly. gazebo 2018-07-24 11:06:50 +08:00
  • a9a37ac278 - treat OrderStatusPurchased as new gazebo 2018-07-24 10:07:50 +08:00
  • de21819f71 - refactor model register. gazebo 2018-07-24 09:46:30 +08:00
  • 3439ef3669 - callLegacyMsgHandler = false. gazebo 2018-07-24 09:28:02 +08:00
  • e23223ed32 - don't call InitOrder when not calling legacy handler. gazebo 2018-07-23 22:28:52 +08:00
  • acfe64c200 - register model.Jxstorefeature. gazebo 2018-07-23 18:47:39 +08:00
  • 857f2cae45 - jxstorefeature support added. gazebo 2018-07-23 18:35:48 +08:00
  • 479ce46200 - fixed a bug in defsch.init, replace LoadOrder with GetOrder. - dynamic table name for legacy order related table. gazebo 2018-07-23 17:30:22 +08:00
  • 96d8e7b2fa - add HEAD / to make uptime happy. gazebo 2018-07-22 23:36:24 +08:00
  • 818856a5ed - fixed bug wrong use orderid ref in loadSavedOrderFromMap. gazebo 2018-07-22 23:26:45 +08:00
  • ae214d38b9 - timer task shceuled to order goroutine to avoid concurrent problem. gazebo 2018-07-22 23:11:20 +08:00
  • 52ac5ca64a - save real order status when new order msg came. gazebo 2018-07-22 21:57:56 +08:00
  • 7ae0944fc9 - log msg refactor, add orderID to all logs. gazebo 2018-07-22 16:44:44 +08:00
  • 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) gazebo 2018-07-22 13:45:16 +08:00
  • dcdf432ac9 - change OrderCreatedAt to to purchase completed time, not start time. gazebo 2018-07-22 08:29:34 +08:00
  • ae6198220c - min timeout scattered. - fix LoadPendingOrders bug when there is no waybill. gazebo 2018-07-22 01:06:34 +08:00
  • 77c1dd07b5 - refactor - load pending orders, fixed bug. gazebo 2018-07-22 00:19:38 +08:00
  • b9e59e1197 - set dynamic token when starting up. gazebo 2018-07-21 14:17:48 +08:00
  • 260453be69 - RefreshWeixinToken and RefreshElmToken firs time run must completed before main workflow going. gazebo 2018-07-21 13:30:43 +08:00
  • 1958f24705 - handle pending orders and waybills when starting. gazebo 2018-07-21 12:57:20 +08:00
  • 65eeef9966 - fix weixin push msg bug. - handle jd out-of-order msg. gazebo 2018-07-20 23:22:31 +08:00
  • 6f0d27e54d - fix weixin bug. gazebo 2018-07-20 20:36:34 +08:00
  • 40aa67546c - send weixin msg to me. gazebo 2018-07-20 18:39:26 +08:00
  • 6ec928611d - avoid openid is null. gazebo 2018-07-20 18:21:10 +08:00
  • 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 gazebo 2018-07-20 18:10:14 +08:00
  • 6fc02ac6cd - don't send OrderStatusWaitOutStore to freshfood. gazebo 2018-07-20 09:08:44 +08:00
  • 486eee8bcd - don't treat no rows as error. gazebo 2018-07-19 22:15:13 +08:00
  • cb6fd8b850 - avoid savedOrderInfo is nil. - change conf. gazebo 2018-07-19 22:06:10 +08:00
  • fb2cd82e20 - move some funcs from controller to jxutils. gazebo 2018-07-19 21:20:18 +08:00
  • 680c0a0696 - fixed mtps fee cal bug. gazebo 2018-07-19 21:10:26 +08:00
  • 61157174e6 - fix mtps delivery fee bug. gazebo 2018-07-19 19:12:54 +08:00
  • a56cb64f8e - delivery fee added. - fixed scheduler bug gazebo 2018-07-19 18:05:40 +08:00
  • 56fcb4f4ed - add more debug info. gazebo 2018-07-19 16:01:10 +08:00
  • b2fe831504 - debug info added for shceduler. gazebo 2018-07-19 15:01:07 +08:00
  • dff1cdd730 - avoid call CancelWaybill on purchase platform. gazebo 2018-07-19 12:33:53 +08:00
  • 308b5b2cef - fixed a bug, savedOrderInfo.timer is nil. gazebo 2018-07-19 12:27:53 +08:00
  • 3098740dce - bug fix. gazebo 2018-07-19 12:18:36 +08:00
  • bbed659c04 - fixed panic caused by other status in mergeOrderStatusConfig. gazebo 2018-07-18 23:51:54 +08:00
  • 50a4a2a940 - fixed platform vendor id error when registering. gazebo 2018-07-18 23:23:42 +08:00
  • cc9e1dc5d2 - first version of order schedule. gazebo 2018-07-18 22:52:30 +08:00
  • 15439779b2 - order.WaybillVendorID default to order vendor. gazebo 2018-07-18 09:44:53 +08:00
  • 9ab535fa3b - save order_sku.sku_type and promotion_type gazebo 2018-07-17 22:47:49 +08:00
  • 376d797f0a - change conf/app.conf to test new order scheduler. - set callLegacy, callNew and handleLegacyJxOrder to true. gazebo 2018-07-17 22:28:53 +08:00
  • ada0dbc4f3 - handle utf8mb4 in elm and jd order. gazebo 2018-07-17 22:18:38 +08:00
  • f9096a7b17 - write legacy jxoder almost ok. gazebo 2018-07-17 18:01:49 +08:00
  • 77d1ea1d77 - fixed bug when calling legacyWriteJxOrder. gazebo 2018-07-16 17:38:24 +08:00
  • 5e59317ec7 - 定单--->订单 gazebo 2018-07-16 17:17:37 +08:00
  • b75739d6c2 - jxorder, only waybill status related left, other info saved. gazebo 2018-07-16 17:14:17 +08:00
  • ea3aec81a4 - add missing table jxordersku. gazebo 2018-07-16 11:20:24 +08:00
  • 5f0e32aefd - read config handleLegacyJxOrder. gazebo 2018-07-16 11:15:50 +08:00
  • 4f41699415 - dont' register models: Elemeorder2 and Jdorder2. gazebo 2018-07-16 11:13:04 +08:00
  • d3ba00679d - fix bug about elm order callback msg replay. gazebo 2018-07-16 11:10:16 +08:00
  • e1e5e93319 - apis interact with PurchasePlatform added. gazebo 2018-07-15 20:44:25 +08:00
  • de2545c3e2 - purchase platform, cancel waybill added. gazebo 2018-07-15 09:57:29 +08:00
  • 805925ff58 - mtps, dada create waybill - create legacy jxorder(not finished). gazebo 2018-07-14 14:35:51 +08:00
  • 52248ca427 - empty scheduler added. gazebo 2018-07-12 20:53:22 +08:00
  • 1c6ba2e43a - refactor. gazebo 2018-07-12 16:19:47 +08:00