Commit Graph

  • 886d2b1f15 - OrderStatusFinishedPickup can call SelfDeliverDelievered. gazebo 2018-08-03 12:44:23 +08:00
  • edd934233f - enable dada. gazebo 2018-08-03 11:38:57 +08:00
  • 1e4bbc3dd6 - ommit nowrow error. gazebo 2018-08-03 09:55:45 +08:00
  • 91e4638b70 - add orderID info. gazebo 2018-08-03 09:43:49 +08:00
  • 4ebd17e793 - fix bug, orm.Read need fields name. gazebo 2018-08-03 09:34:20 +08:00
  • aedf0c7eeb - don't unrolling order status. gazebo 2018-08-03 09:22:11 +08:00
  • fbef61c768 - add remark in orderstatus table. - check order.waybill vendor id in swtich2SelfDeliverWithRetry. gazebo 2018-08-02 18:07:54 +08:00
  • ba98cf1e27 - don't treat multiple accept as warning. - every time jd dada create new bill, must wait some time. gazebo 2018-08-02 17:12:35 +08:00
  • 02e50139e0 - allow create waybill in delivering status. gazebo 2018-08-02 12:09:50 +08:00
  • b6b41a703b - record addFee in temp_log. gazebo 2018-08-02 09:55:50 +08:00
  • 0d759218c1 - write important error msg to db. gazebo 2018-08-02 09:24:18 +08:00
  • f0ea5f1186 - pickup error as info. gazebo 2018-08-01 17:55:01 +08:00
  • ab6efb48ab - waybill retry count set to 3. gazebo 2018-08-01 15:30:43 +08:00
  • 9fd340abfa - handle mtps create waybill error. - log accept or decline order error with info level. gazebo 2018-08-01 12:13:27 +08:00
  • 95e27e6803 - fix bug, calling resetTimer should give correct isPending. gazebo 2018-08-01 10:38:45 +08:00
  • cd3a4b651a - change jx-callback.service Requires MySQL to Wants MySQL. - don't treat CreateWaybill fail as warning. gazebo 2018-08-01 10:23:59 +08:00
  • 7afa99620a - add poi_seq when creating mtps waybill. - cancel waybill in new msg when order status already end. gazebo 2018-07-31 20:29:55 +08:00
  • 4fd0e8d359 - bug output warning in addWaybill2Map fixed(reversed). gazebo 2018-07-31 16:21:56 +08:00
  • 45970ca08b - backup when copy files to remote to deploy. gazebo 2018-07-31 15:59:18 +08:00
  • c7f35cd6a3 - rumode. gazebo 2018-07-31 15:25:00 +08:00
  • 85b7fcc05f - fix conf/app.conf gazebo 2018-07-31 15:22:50 +08:00
  • 01414c91b5 - fk. gazebo 2018-07-31 15:03:54 +08:00
  • 1af867bd0f - ansible.yml gazebo 2018-07-31 15:00:57 +08:00
  • 6085f900e2 - hosts variable in ansible.yml gazebo 2018-07-31 14:59:18 +08:00
  • 88470319f5 - systemd and ansbile files added. gazebo 2018-07-31 14:49:32 +08:00
  • b8cef23e9b - OrderStatusNew and OrderStatusFinishedPickup timer type changed to TimerTypeBaseStatusTime. gazebo 2018-07-31 10:21:25 +08:00
  • 075e936dc0 - use actual price when creating waybill. gazebo 2018-07-31 09:57:30 +08:00
  • a83e17dd34 - fixed not initialize waybills in WatchOrderInfo. gazebo 2018-07-31 09:33:48 +08:00
  • 8496a745c0 - don't use func init() in main.go gazebo 2018-07-31 09:03:37 +08:00
  • 16db9af499 - change savedwaybill2map. gazebo 2018-07-30 23:10:33 +08:00
  • 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. gazebo 2018-07-30 21:02:16 +08:00
  • 0615758d9a - limit mtps max addfee to 200. gazebo 2018-07-30 17:45:38 +08:00
  • a7d63caf08 - limit dada cargoprice to 63.99 gazebo 2018-07-30 16:28:25 +08:00
  • 0464042d49 - comment modified for elm order price info. gazebo 2018-07-30 14:48:16 +08:00
  • 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