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

Commit Graph

  • d9031612e1 - copy swagger files. gazebo 2018-09-04 22:02:37 +08:00
  • deca8efb96 - auth for weixin. gazebo 2018-09-04 21:23:51 +08:00
  • 1dda77ee3a - redirect added. gazebo 2018-09-04 16:31:00 +08:00
  • 5966b397d0 - weixinsns. gazebo 2018-09-04 15:54:51 +08:00
  • d979b645bd Merge branch 'master' into jxstore gazebo 2018-09-03 18:30:56 +08:00
  • 8f5288c771 - fix toke to token. gazebo 2018-09-03 18:30:32 +08:00
  • 70d5ae5dd1 - cms store management. gazebo 2018-09-03 18:28:37 +08:00
  • 426fe7c570 - cms place ok. gazebo 2018-09-03 11:56:56 +08:00
  • 945431d566 - basic cms structure. gazebo 2018-09-02 19:11:54 +08:00
  • d46bc8981a Merge branch 'master' into jxstore gazebo 2018-08-31 15:26:40 +08:00
  • de1622e0cc - use modified bee tool to automatically generate parameters validation code to avoid dirty work. gazebo 2018-08-31 15:23:25 +08:00
  • 29d358af5e - jd basic api(category, sku, store management) finished. gazebo 2018-08-30 15:22:26 +08:00
  • 7774fd0995 - remove fk. gazebo 2018-08-30 15:18:03 +08:00
  • 3538371333 - make master compilable. gazebo 2018-08-30 00:32:57 +08:00
  • f7f536078a - OrderAcceptOperate only return one result. gazebo 2018-08-29 23:25:06 +08:00
  • 0f68d904bd - treat DeliveryStatusFailedGetGoods as WaybillStatusFailed for jd waybill - adjust defsch. gazebo 2018-08-29 21:37:48 +08:00
  • 55ef8e9ea3 - fix sync LockStatus bug in orderman.addOrderStatus. gazebo 2018-08-28 13:57:40 +08:00
  • f7e655ec6b - add refresh param for api GetStoreOrderInfo to get realtime CurrentConsigneeMobile. gazebo 2018-08-27 14:31:11 +08:00
  • 9e515aff68 - enable store sku bind warning for 100928 and 100929. gazebo 2018-08-27 11:53:26 +08:00
  • ffd85f9366 - fk3 gazebo 2018-08-24 17:01:58 +08:00
  • 4dcd8b0fb8 - fk2. gazebo 2018-08-24 16:04:06 +08:00
  • 538c2dddd1 - fk. gazebo 2018-08-24 15:51:17 +08:00
  • e2c5e467fc - fix bug. gazebo 2018-08-24 15:32:10 +08:00
  • 2f19dcf546 - fix bug. gazebo 2018-08-24 15:21:49 +08:00
  • bc5e4a3449 - GetOrderInfo and GetOrderWaybillInfo added. gazebo 2018-08-24 15:16:30 +08:00
  • 54063d2f35 - num == 0. gazebo 2018-08-24 14:25:03 +08:00
  • ec410563af - use table ede_skus and jde_sku_infos to display sku image. gazebo 2018-08-24 14:17:05 +08:00
  • bb049bb28b - order.DeliveryFlag added. gazebo 2018-08-24 10:03:34 +08:00
  • 46bbb7418c Merge branch 'jxstore' gazebo 2018-08-23 21:08:06 +08:00
  • 7352ca409a - temp. gazebo 2018-08-23 21:07:29 +08:00
  • dc3a14b448 - limit feasible order status for CreateWaybillOnProviders. gazebo 2018-08-23 16:16:18 +08:00
  • 6df89a17b5 - log for external api. gazebo 2018-08-23 15:53:26 +08:00
  • 3f426746cf - fix calculate order shop price bug(multiple skuCount). - map DeliveryStatusCourierCanceled to WaybillStatusAcceptCanceled for jd. gazebo 2018-08-23 15:38:03 +08:00
  • d4de5b4caf - token. - don't treat DeliveryStatusFailedGetGoods as failed delivery(jd). gazebo 2018-08-23 15:05:04 +08:00
  • 471007a7e9 - handle ErrNoRows in LoadOrder. gazebo 2018-08-23 14:31:57 +08:00
  • 91bdcad933 - change wrong tag _ to - for json. gazebo 2018-08-23 12:11:36 +08:00
  • 5f10f01027 - status judge. gazebo 2018-08-23 11:51:20 +08:00
  • 1cb266d4d1 - change Switch2SelfDeliver to SelfDelivering. gazebo 2018-08-23 09:53:52 +08:00
  • 50f8ee12d6 - auto route info gazebo 2018-08-23 09:47:12 +08:00
  • 6ddb39eebb - SelfDeliveredAndUpdateStatus added. gazebo 2018-08-23 09:45:25 +08:00
  • cdd603f6ed - SkuJdCategory added. gazebo 2018-08-22 17:41:17 +08:00
  • b6f99c4cf0 Accept Merge Request #6: (jxstore -> master) Merge Request: jxstore初始版本 Created By: @XJH-Rosy Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/6 XJH-Rosy 2018-08-22 17:16:04 +08:00
  • 4ccb8ef402 - fixed bug (error msg should set on Desc, not Data). gazebo 2018-08-22 16:28:47 +08:00
  • 79ed0a7929 - cancel waybill reason added. - api operator added. - token added. gazebo 2018-08-22 16:06:47 +08:00
  • 5afe95d422 - fix some annotation. gazebo 2018-08-22 14:14:10 +08:00
  • 72f468b580 - fixed panic bug in GetStoreOrderCountInfo. gazebo 2018-08-22 12:01:56 +08:00
  • 5bcba91308 - auto gen router info. gazebo 2018-08-22 10:57:18 +08:00
  • 0b9189cb87 - paging added for GetStoreOrderInfo. - GetStoreOrderCountInfo added. gazebo 2018-08-22 09:41:02 +08:00
  • d44950d6db - consider status wrong as normal for in defsch. gazebo 2018-08-21 20:56:49 +08:00
  • d18e53e9f4 - handle num == 0 in GetOrderSkuInfo. gazebo 2018-08-21 18:16:59 +08:00
  • c1db460666 - fixed wrong image in GetOrderSkuInfo. gazebo 2018-08-21 17:36:20 +08:00
  • 643bcac0f8 - order manager added. gazebo 2018-08-21 17:18:08 +08:00
  • c29bcea27c - refactor. gazebo 2018-08-20 18:07:02 +08:00
  • b74a5e4379 - update courier_name and courier_mobile on event >= model.WaybillStatusAccepted and < model.WaybillStatusEndBegin. gazebo 2018-08-20 15:30:59 +08:00
  • b69bac1182 - use auto router for callback msg. - first normal demo api FinishedPickup added. gazebo 2018-08-20 15:08:36 +08:00
  • eeeab319fa - rough sku. gazebo 2018-08-20 10:58:45 +08:00
  • c5db19045d - continue refactoring... gazebo 2018-08-17 16:42:16 +08:00
  • d40186e930 - refactor file structure. gazebo 2018-08-17 13:59:15 +08:00
  • d872d4d0ec - fix bug in resetTimer(wrong place for handling autoPickupTimeoutMinute > 1). gazebo 2018-08-17 09:41:16 +08:00
  • 78c7409631 - autopickup config to store. gazebo 2018-08-16 14:37:30 +08:00
  • 2b4e2ee1e9 - fix bug in SplitSkuName. gazebo 2018-08-16 10:26:24 +08:00
  • d27caab804 - fix create waybill fail msg. gazebo 2018-08-16 09:59:40 +08:00
  • 97c9955ed8 - disable manually click delivery finished warning. gazebo 2018-08-15 22:08:29 +08:00
  • ea5a0c6428 - fk. gazebo 2018-08-15 14:12:42 +08:00
  • da889ff944 - fix bug in order.addOrderStatus. gazebo 2018-08-13 18:26:41 +08:00
  • bd3a51b0a9 - avoid panic in setOrederDetailFee. gazebo 2018-08-13 15:50:11 +08:00
  • ff1d223933 - don't cancel master waybill when received order delivered msg. gazebo 2018-08-13 11:59:07 +08:00
  • 41d2d4bce9 - Info to Infof. gazebo 2018-08-13 11:34:34 +08:00
  • ef78e9f64b - it's normal when order finished mesg comes before purchase platform waybill delivered msg. gazebo 2018-08-13 09:05:29 +08:00
  • bb14ae6e72 - disable store sku price related warning(too many). gazebo 2018-08-12 19:03:49 +08:00
  • f5f3805470 - send weixin msg more accurately. gazebo 2018-08-11 16:37:16 +08:00
  • 75a0f77c6f - change call freshfodd timeout to 2.5 seconds. gazebo 2018-08-11 08:31:31 +08:00
  • 27682fe85f - fixed sql error. gazebo 2018-08-11 08:29:11 +08:00
  • e9f6ae07df - fix format error. gazebo 2018-08-10 23:49:09 +08:00
  • 030e364b06 Merge remote-tracking branch 'refs/remotes/origin/master' gazebo 2018-08-10 23:13:38 +08:00
  • 22e96a0232 - refactor Infof for sku info update. gazebo 2018-08-10 23:11:58 +08:00
  • 21f33b7e5a Accept Merge Request #3: (lyb -> master) Merge Request: 实时从饿了么平台API获取数据。 Created By: @LYB-Rosy Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/3 XJH-Rosy 2018-08-10 17:38:26 +08:00
  • 1a647ea5f2 修改代码 lyb 2018-08-10 17:36:09 +08:00
  • aac9881f6a 修改代码 lyb 2018-08-10 17:30:07 +08:00
  • 5cccfd532f Merge remote-tracking branch 'remotes/origin/master' into lyb lyb 2018-08-10 16:52:26 +08:00
  • 01d3221d3a 访问饿了么API，获取结账必要信息。 lyb 2018-08-10 16:51:57 +08:00
  • a6883fb568 访问京东API，获取结账必要信息。 lyb 2018-08-10 16:47:35 +08:00
  • a039b31e39 饿了么可实时获取的结账必要信息。 lyb 2018-08-10 16:46:59 +08:00
  • c3b5e669d4 - savedOrderInfo.retryCount++ only when actually created at least one waybill. gazebo 2018-08-10 16:38:52 +08:00
  • 5d66c1f6aa - change elm vendor_sku_id from skuId to vfoodId. gazebo 2018-08-10 15:53:35 +08:00
  • f87a98c4ca - AccessFreshFood finally failed. gazebo 2018-08-10 15:46:33 +08:00
  • dd9afa4248 - handle ShopPrice. gazebo 2018-08-10 15:21:33 +08:00
  • 70cc7fffed Accept Merge Request #2: (lyb -> master) Merge Request: 从京东平台API获取结账必须信息放入数据表新字段中 Created By: @LYB-Rosy Accepted By: @XJH-Rosy URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/2 XJH-Rosy 2018-08-10 11:24:33 +08:00
  • 1eb7a1ff03 访问京东API，获取结账必要信息。 lyb 2018-08-10 11:13:51 +08:00
  • 66a90a6f3a 访问京东API，获取结账必要信息。 lyb 2018-08-10 11:04:20 +08:00
  • 3bc6608e1f 访问京东API，获取结账必要信息。 lyb 2018-08-10 11:02:06 +08:00
  • dad4ab5d73 访问京东API，获取结账必要信息。 lyb 2018-08-10 10:19:03 +08:00
  • c45858e4e9 重修代码 lyb 2018-08-10 10:17:21 +08:00
  • f5fd65f6ea - change generateLegacyJxOrder to false. - move substore info from goods_order to order_sku. gazebo 2018-08-09 21:25:36 +08:00
  • a873eb5a06 修改错误代码 lyb 2018-08-09 18:47:36 +08:00
  • f281f4e7ab 访问京东API，获取结账必要信息。 lyb 2018-08-09 16:43:36 +08:00
  • 98c80cfb08 Merge remote-tracking branch 'remotes/origin/master' into jx-callback lyb 2018-08-09 16:39:23 +08:00
  • 0ef674c072 访问京东API，获取结账必要信息。 lyb 2018-08-09 16:37:38 +08:00
  • ca40c54080 - change Warnf to Infof in model.WaybillStatusFailed. gazebo 2018-08-09 09:35:01 +08:00
  • 8bb1badb2c - refactor cancel waybill reason. gazebo 2018-08-08 14:20:25 +08:00