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

Commit Graph

  • 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
  • 6386f1b6f5 - big big refactor. gazebo 2018-07-12 14:41:40 +08:00
  • ac2d4214e5 - enable elm user urge order. - delay 4 minutes when got new elm order. gazebo 2018-07-11 09:12:46 +08:00
  • c6a3066daf - record order ok. gazebo 2018-07-10 19:06:51 +08:00
  • a76213e8f0 - first compilable version of order handler. gazebo 2018-07-10 13:37:35 +08:00
  • 49ec11baf8 - change all vender to vendor. gazebo 2018-07-08 18:46:32 +08:00
  • 70540dfa41 - change freshfood retry count to 1, timeout to 20s. gazebo 2018-07-08 13:37:25 +08:00
  • 704f232c99 - revert to confirm 200 when calling freshfood from jx-callback. gazebo 2018-07-08 12:34:00 +08:00
  • a4093416a8 - fk. gazebo 2018-07-08 09:24:52 +08:00
  • b875be8dd6 - don't treat non 200 as error when calling legacy freshfood interface. gazebo 2018-07-08 09:20:48 +08:00
  • 8e07f131cd - add elm client urge msg. gazebo 2018-07-06 18:07:38 +08:00
  • bed727d3e5 - big refactor. gazebo 2018-07-05 12:21:25 +08:00
  • c43ec48837 - for elm order, the type of order msg must in resaonable sequence. gazebo 2018-07-05 11:04:47 +08:00
  • a83e2102a5 - remove corm. gazebo 2018-07-04 17:44:44 +08:00
  • d7fa2b103e - add info log for OrderAcceptOperate. gazebo 2018-07-04 10:58:03 +08:00
  • 99ace915fc - change jd bad comment push format. gazebo 2018-07-04 10:45:03 +08:00
  • b402bb4395 - test jenkins. gazebo 2018-07-04 10:16:56 +08:00
  • ca783746ab - remove redundant log. gazebo 2018-07-04 09:07:08 +08:00
  • 7217d0cee7 - change field size of elm order(Mobile and Consignee). gazebo 2018-07-03 17:27:00 +08:00
  • c6088a7dd4 - more fields on elemeorder. gazebo 2018-07-03 15:35:02 +08:00
  • 339da74d44 - fix bug write elm data to db. gazebo 2018-07-03 10:41:10 +08:00
  • 8a75fb9beb - refactor auto accept order, explicit refuse added. gazebo 2018-07-02 22:39:16 +08:00
  • 009f67fff5 - fix bug len(phoneList) >= 1 in elm orderMessage. gazebo 2018-07-02 15:25:35 +08:00
  • bddc7acf08 - fix jd buyerMobile bug in JD newOrder. gazebo 2018-07-02 15:02:58 +08:00
  • b48340156a - change BlackClient.CreatedAt and UpdatedAt to nullable. gazebo 2018-07-02 14:18:29 +08:00
  • b82729709d - add black user . gazebo 2018-07-02 13:37:52 +08:00
  • 28921345e8 - more error and warn output. gazebo 2018-07-01 10:11:28 +08:00
  • e26edffca4 - refactor refresh config logic. gazebo 2018-06-30 07:58:09 +08:00
  • 2795271dd6 - add .log .bak to git ignore files. gazebo 2018-06-30 07:29:56 +08:00
  • b35ec0ee91 - notify freshfood when weixin or elm token changed. gazebo 2018-06-30 07:26:58 +08:00
  • 941514d143 - more detail msg when can not find jdorder in db. gazebo 2018-06-29 18:26:51 +08:00
  • 76b02763ec - fix elm setToken bug gazebo 2018-06-29 18:11:01 +08:00
  • 30d77cad2e routers/commentsRouter_controllers.go added. gazebo 2018-06-29 15:26:07 +08:00
  • a727fc644b - fix ELMOrderStatus gazebo 2018-06-29 14:20:36 +08:00
  • 340e0fbe63 - refactor rename order to msg. gazebo 2018-06-29 12:26:21 +08:00
  • 494d4cb8cf - remove utils.Str2Int(use int(utils.Str2Int64) instead). gazebo 2018-06-29 11:52:08 +08:00
  • bcc95475db - add jd order comment msg. gazebo 2018-06-29 11:33:09 +08:00
  • 73369ef436 - add test config - refresh elme and weixin token only in prod env. - change dada callback to dadadelivery/msg gazebo 2018-06-29 10:43:40 +08:00
  • 718c54b507 - elm use routine pool. gazebo 2018-06-28 12:38:45 +08:00
  • b756990cee - add missing JdOrderID when sending msg to freshfood. gazebo 2018-06-28 10:33:09 +08:00
  • b496b751bc - refactor. gazebo 2018-06-28 10:13:17 +08:00
  • acfb2512f5 - Jdorder.Data is not string when Marsha.l gazebo 2018-06-28 09:48:30 +08:00
  • 5187282b7d - change Jdorder.Success to bool. refine the json field name of Jdorder. gazebo 2018-06-27 22:38:49 +08:00
  • fce760e3dc - change log level to info when err in AccessFreshFood. gazebo 2018-06-27 19:01:56 +08:00
  • 54866686ac - jd new order and adjust order. gazebo 2018-06-27 18:34:30 +08:00
  • 5d6a2964c2 - RouterCaseSensitive = false. - debug calling freshfood. gazebo 2018-06-27 16:54:26 +08:00
  • 9b34fd5e41 - use request body when handling jd msg. - when check pending jd order msg, limit to 2days gazebo 2018-06-27 15:43:41 +08:00