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

Commit Graph

  • 86c1b0957f - router changed. gazebo 2018-09-18 09:11:22 +08:00
  • 72ced211e9 - move place man from store to cms. gazebo 2018-09-18 08:52:17 +08:00
  • 80d76ba94f - GetPlaces don't support vendorID. gazebo 2018-09-17 21:31:06 +08:00
  • 6c683d5cf2 - fk. gazebo 2018-09-17 19:05:42 +08:00
  • e2caafc4c9 - fk. gazebo 2018-09-17 19:02:55 +08:00
  • b1eb5325c7 - fk. gazebo 2018-09-17 18:51:47 +08:00
  • f5e1f661f3 - fk. gazebo 2018-09-17 18:45:43 +08:00
  • 431b4e3606 - sync store after creating store. gazebo 2018-09-17 18:36:33 +08:00
  • 8f11160fa5 - fb. gazebo 2018-09-17 17:51:36 +08:00
  • 764bc0b7b3 - fix bug send msg to closed channel. gazebo 2018-09-17 17:49:13 +08:00
  • 35da901319 - isGlobal is int. gazebo 2018-09-17 16:38:33 +08:00
  • 531366631f - update places when only isGlobal is false. gazebo 2018-09-17 16:34:53 +08:00
  • 8e85a240e8 - rollback when panic. gazebo 2018-09-17 16:18:04 +08:00
  • 9a6808e9dd - beta added. gazebo 2018-09-17 15:02:46 +08:00
  • b05d1091fa Merge remote-tracking branch 'origin/master' into jxstore gazebo 2018-09-17 15:01:48 +08:00
  • 22ab40db16 - test. gazebo 2018-09-17 14:44:18 +08:00
  • 3f2a2f524a - test. gazebo 2018-09-17 14:42:34 +08:00
  • 2bc8500714 - support alpha deploy. gazebo 2018-09-17 14:38:02 +08:00
  • b5b699217a - alpha config added. gazebo 2018-09-17 12:27:21 +08:00
  • d7b4df6e97 Merge branch 'master' into jxstore gazebo 2018-09-17 11:10:20 +08:00
  • d8e585e86d - don't register legacy order tables when GenerateLegacyJxOrder is not enabled. gazebo 2018-09-17 11:08:48 +08:00
  • a42f450368 - use DeletedAt to judge whether store sku is focused. gazebo 2018-09-17 11:01:10 +08:00
  • ba28d75d06 - sku_category unique index add level. gazebo 2018-09-17 10:30:55 +08:00
  • 30d94bf688 - jd SyncStoreSku. gazebo 2018-09-16 16:37:46 +08:00
  • b9497d028f - sync. gazebo 2018-09-16 12:55:23 +08:00
  • a8ae37c641 - try to fix SQL_CALC_FOUND_ROWS (use transaction) gazebo 2018-09-15 23:04:46 +08:00
  • 04e105d8d1 - AddSkuName. gazebo 2018-09-15 22:56:23 +08:00
  • ac5cfdc4c9 - fix nameID. gazebo 2018-09-15 22:51:15 +08:00
  • 32917b40fd - debug SQL_CALC_FOUND_ROWS. gazebo 2018-09-15 22:47:27 +08:00
  • ee4bf03fcc - fk. gazebo 2018-09-15 22:43:32 +08:00
  • 6591373000 - if vendorSkuID is empty, don't update JdID. gazebo 2018-09-15 22:38:30 +08:00
  • 294cc59bde - temporarily disable after sku created check. gazebo 2018-09-15 22:27:56 +08:00
  • caf40adf88 - debug. gazebo 2018-09-15 22:15:45 +08:00
  • 1df63ff45d - avoid JdID duplicated when creating cat or sku. gazebo 2018-09-15 21:55:03 +08:00
  • af5038e8a7 - task schedule added. gazebo 2018-09-15 18:53:39 +08:00
  • b2d365e36f - rf. gazebo 2018-09-15 09:15:40 +08:00
  • da6c411c74 Merge remote-tracking branch 'origin/master' into jxstore gazebo 2018-09-14 15:44:24 +08:00
  • 2350e182a5 - up. gazebo 2018-09-14 15:44:13 +08:00
  • 9c2c8e4b8e - ComposeSkuName. gazebo 2018-09-14 15:21:49 +08:00
  • 87ddd8aa52 - write JdID when after create sku on jd successfully. gazebo 2018-09-14 11:58:09 +08:00
  • f45698e89b cms. gazebo 2018-09-14 11:38:05 +08:00
  • 4bfb7c235a - rf. gazebo 2018-09-14 11:21:45 +08:00
  • 315e202312 - GetQiniuUploadToken add fileName. gazebo 2018-09-14 10:01:34 +08:00
  • 84ea7d20ba - UpdateStoreSku gazebo 2018-09-13 23:11:02 +08:00
  • 20c3c0341a - change skuName place bind to bare bind. gazebo 2018-09-13 21:49:00 +08:00
  • 99c60d2233 - store sku GetStoreSkus. gazebo 2018-09-13 18:34:44 +08:00
  • deaee35464 - GetQiniuUploadToken gazebo 2018-09-13 14:52:46 +08:00
  • f782e8dcc0 - fix placeCond and vendorStoreCond bug. gazebo 2018-09-13 11:29:28 +08:00
  • 016727586d - vendorStoreCond and placeCond comment changed. gazebo 2018-09-13 10:42:08 +08:00
  • 380c739660 - GetSkuNames support level 1 category. gazebo 2018-09-13 09:47:43 +08:00
  • f14112c030 - skuName place bind man. gazebo 2018-09-12 23:15:54 +08:00
  • ecd19c55b3 - sku almost ok. gazebo 2018-09-12 19:04:19 +08:00
  • 95c52ba9dd - useGetRowsWhenGetRow. gazebo 2018-09-12 16:21:22 +08:00
  • 0fd377e0d3 - user man and user store bind. gazebo 2018-09-12 15:18:56 +08:00
  • 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