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

Commit Graph

  • 05bd085116 - add bank list. gazebo 2018-09-12 10:16:29 +08:00
  • 356c605bd8 - fk. gazebo 2018-09-11 22:40:33 +08:00
  • b1c258bc7a - cms/GetServiceInfo. gazebo 2018-09-11 22:35:18 +08:00
  • 3f4bdbfdca Merge remote-tracking branch 'origin/master' into jxstore gazebo 2018-09-11 22:22:42 +08:00
  • 52041a142e - ebai gazebo 2018-09-11 22:22:13 +08:00
  • 4dcc31e36d - GetServerInfo added. gazebo 2018-09-11 18:34:59 +08:00
  • 7f4c125279 - sku man. gazebo 2018-09-11 16:20:27 +08:00
  • 70bf5a522a - move some funcs from jxtools to dao. gazebo 2018-09-11 11:38:31 +08:00
  • 45ce7352fc - fix SyncStatuss to SyncStatus. gazebo 2018-09-11 09:30:57 +08:00
  • e0c0a44c20 - make SkuNameExt.Skus as real object (not string). gazebo 2018-09-10 22:36:57 +08:00
  • 9be4b9fdd9 - sync store after bind vendor store. gazebo 2018-09-10 18:34:50 +08:00
  • 834b74a09d - rf. gazebo 2018-09-10 18:26:59 +08:00
  • 6ee4e43286 - GetSkuNames added. gazebo 2018-09-10 18:09:56 +08:00
  • 67655f57e0 - DeleteCategory added. gazebo 2018-09-10 15:17:58 +08:00
  • 7d7b2e29e9 - sku category gazebo 2018-09-10 07:48:29 +08:00
  • ce56d774a2 - sku category. gazebo 2018-09-10 07:47:18 +08:00
  • d8907cf010 - sku category man almost ok. - mysql connect str add utf8mb4. gazebo 2018-09-09 20:43:48 +08:00
  • 60ea461e39 - disable call QuerySingleOrder when received DeliveryStatusAccepted msg. gazebo 2018-09-09 18:21:40 +08:00
  • d71b0e6763 - handle store.Status. gazebo 2018-09-09 14:54:17 +08:00
  • fbd28ab887 - temporarily disable Update jd store. gazebo 2018-09-09 13:51:16 +08:00
  • d312a672fc - fixed bug in GetStoreVendorMaps gazebo 2018-09-09 12:46:21 +08:00
  • fc05f326b7 - store man almost ok. gazebo 2018-09-09 12:32:24 +08:00
  • 8c130a15a4 - all db orm use beego orm, don't use gorm anymore. gazebo 2018-09-08 12:55:39 +08:00
  • 711013fab4 Merge branch 'master' into jxstore gazebo 2018-09-07 17:01:40 +08:00
  • 8add72eb34 ! remove all non order code. gazebo 2018-09-07 16:57:04 +08:00
  • b714e445a4 Merge branch 'master' into jxstore gazebo 2018-09-07 14:01:18 +08:00
  • eeed813c46 - switch doamin to jx.scaqda gazebo 2018-09-07 13:56:09 +08:00
  • 07006742cc Merge branch 'master' into jxstore gazebo 2018-09-07 11:51:21 +08:00
  • 6a4a84826e - jd unlockOrder msg added. gazebo 2018-09-07 11:50:04 +08:00
  • 686256be3e - change price store to 100961/163183405. gazebo 2018-09-07 10:37:34 +08:00
  • cf26f57b6c - change UpdateStore to FUpdateStore for a fucking bug. gazebo 2018-09-07 09:44:06 +08:00
  • d575ed5cb0 - make gorm.DB singleton. gazebo 2018-09-06 22:29:08 +08:00
  • 5814b27af4 - return totalCount for GetStores. gazebo 2018-09-06 15:14:11 +08:00
  • 1e3715456d - comment gazebo 2018-09-06 09:50:17 +08:00
  • 88e1ba29e7 Merge branch 'master' into jxstore gazebo 2018-09-05 23:20:41 +08:00
  • f44f947629 - change mtps extra fee time from 11:30-13:00 to 11:00-14:00 gazebo 2018-09-05 23:19:22 +08:00
  • c52e8deade - fix calculateOrderDeliveryFee bug for weight. gazebo 2018-09-05 22:48:15 +08:00
  • 0faaa6b366 - mobile sms verify added. gazebo 2018-09-05 18:03:53 +08:00
  • 76b03bf86f - funcs added to IPurchasePlatformHandler. gazebo 2018-09-05 16:24:07 +08:00
  • e734fdb425 Merge branch 'master' into jxstore gazebo 2018-09-05 14:21:52 +08:00
  • 1ed1838802 - mtps Cancel reason all to merchant others. gazebo 2018-09-05 12:22:04 +08:00
  • 9e8ed7d600 - Login data fixed to formData gazebo 2018-09-05 11:46:51 +08:00
  • 26f5c26def - combile SearchStores and GetStores to one func. gazebo 2018-09-05 10:24:30 +08:00
  • b6a8f22612 - localpass. gazebo 2018-09-05 10:06:12 +08:00
  • ad6cabe89d - localpass added. gazebo 2018-09-05 10:04:00 +08:00
  • 64b5afb6e7 Merge branch 'master' into jxstore gazebo 2018-09-04 22:20:05 +08:00
  • 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