Commit Graph

Select branches

Hide Pull Requests

api

jdshop

master

rsm

Mono Color

• 29f82c01b5 - add debug msg for onOrderComment. gazebo 2018-10-09 10:58:49 +08:00
• 7f2d829914 - use new jx to process jd bad comment and elm urge order gazebo 2018-10-09 10:14:28 +08:00
• 818a7d95b1 - switch jd bad comment to new jx. gazebo 2018-10-09 08:41:54 +08:00
• 33ea1d0185 - domain restore to www.jxc4.com gazebo 2018-10-08 19:48:55 +08:00
• 4b150a0181 - trim string after FilterMb4. gazebo 2018-10-08 16:53:11 +08:00
• 922e5175c7 - sync store category. gazebo 2018-10-08 15:33:13 +08:00
• 465f1f0431 - remove debug info for Obj2Excel. gazebo 2018-10-06 09:04:27 +08:00
• 0c87cf008f - SyncStoreCategories gazebo 2018-10-05 12:55:46 +08:00
• 923b7617f8 - CaculateSkuPrice don't calculate when skuname unit is not 份. gazebo 2018-10-05 12:41:38 +08:00
• 2f4da59d35 - change ebai test key. gazebo 2018-09-30 20:53:17 +08:00
• 07b962c3cc - token for ExportMTWaybills gazebo 2018-09-30 19:28:59 +08:00
• 750db7d0e4 - Waybill.CourierName and CourierMobile opened for json. gazebo 2018-09-30 19:24:54 +08:00
• 86aae76980 - fix key name for ExportMTWaybills gazebo 2018-09-30 19:18:00 +08:00
• d0df68740e - ExportMTWaybills - Obj2Excel gazebo 2018-09-30 18:58:05 +08:00
• 834a5b9c24 - CaculateSkuPrice return UnitPrice when unit is 份 gazebo 2018-09-30 11:13:52 +08:00
• 11fc8edf6f - focus store sku, update existing sku status. gazebo 2018-09-30 10:24:55 +08:00
• dfa39b8a04 - GetStoreSkus, fromStatus and toStatus only valid when isFoucs is true. gazebo 2018-09-30 09:35:32 +08:00
• 3e336b1f33 - use eb_sku_id_map to get jx skuid for elm. gazebo 2018-09-30 07:27:08 +08:00
• 5b3b53932c - push jd bad comment. gazebo 2018-09-29 18:45:38 +08:00
• 390312ef82 - fix JxBadComments.UpdatedMsg to text. gazebo 2018-09-29 18:06:57 +08:00
• 5a46392066 - fk. gazebo 2018-09-29 17:30:59 +08:00
• 414b4c4a3d - LoadOrder for jd bad comments. gazebo 2018-09-29 17:26:13 +08:00
• 2a4f26d774 - get funs for jd bad comments. gazebo 2018-09-29 17:23:54 +08:00
• a60ca564fd - save jd bad comments in go. gazebo 2018-09-29 15:58:35 +08:00
• 1b1006986f Merge branch 'master' into jxstore gazebo 2018-09-29 14:32:18 +08:00
• da2b91f342 - remove domain scaqda. gazebo 2018-09-29 06:46:36 +08:00
• 528f9befd2 Merge branch 'master' into jxstore gazebo 2018-09-28 14:13:48 +08:00
• b00201bfca - jd token call back. gazebo 2018-09-28 14:13:28 +08:00
• d1c91c83ce - vfoodId gazebo 2018-09-28 12:25:24 +08:00
• 6244dbec2f - change elm order vendorSkuID from vfoodId to id gazebo 2018-09-28 12:15:22 +08:00
• 40affb2707 - recalculate order.Weight when platform not give gazebo 2018-09-28 12:10:30 +08:00
• 64087ea640 - return proper msg for ebai. gazebo 2018-09-28 11:06:29 +08:00
• d81e8e1644 - handle VendorIDEBAI. gazebo 2018-09-28 10:51:00 +08:00
• 8ba9abc3a5 - ebai order status. gazebo 2018-09-28 10:07:10 +08:00
• 4d468f589a - ebai order_index. gazebo 2018-09-28 09:51:10 +08:00
• 919a342665 - fix callback response. gazebo 2018-09-27 18:44:22 +08:00
• 392b6ad813 - ebai callback. gazebo 2018-09-27 18:01:41 +08:00
• 8100e4c626 Merge remote-tracking branch 'origin/master' into jxstore gazebo 2018-09-27 10:08:10 +08:00
• 73a5f7241e - sync sku to ebai, still have bugs. gazebo 2018-09-26 22:30:19 +08:00
• 49f2d0c969 - up gazebo 2018-09-26 15:50:23 +08:00
• b900bde0f5 - return no error in GetSelfInfo, when there is no such user. gazebo 2018-09-26 15:45:48 +08:00
• ba680cdf8e - use skuName price as unit price for storesku. gazebo 2018-09-26 12:18:59 +08:00
• 7499018f11 - use millisecond as temp id. gazebo 2018-09-25 21:47:45 +08:00
• 95d91e63dc - update jd store phone and mobile. gazebo 2018-09-25 18:26:48 +08:00
• a8974ff4a6 - UpdateEntityLogicallyAndUpdateSyncStatus for model.SyncFlagModifiedMask gazebo 2018-09-25 17:49:20 +08:00
• 366634fc00 - add sync error descript. gazebo 2018-09-25 15:36:49 +08:00
• 543e469eeb - keep store.id when CreateStore. gazebo 2018-09-25 11:35:50 +08:00
• 604f232e60 - ebai gazebo 2018-09-23 23:35:33 +08:00
• b936d3354b - up. gazebo 2018-09-22 23:28:52 +08:00
• f21b4e614d - EnableStoreWrite for SyncSkusIDMap gazebo 2018-09-22 10:40:34 +08:00
• 81089fb85c - category sync almost ok. - refactor tasksch (isContinueWhenError) gazebo 2018-09-22 10:26:31 +08:00
• 0623d31c71 - new err in SyncCategory gazebo 2018-09-21 17:00:28 +08:00
• 7295c16367 - miss use err: in SyncSku gazebo 2018-09-21 16:57:34 +08:00
• dd2eb743cb - change time2Schedule3rdCarrier to half an hour. gazebo 2018-09-21 16:51:00 +08:00
• d74f47a1e6 - fk. gazebo 2018-09-21 16:40:39 +08:00
• 6a4ca3a77a - filter null data in FilterMapByStructObject. gazebo 2018-09-21 16:30:06 +08:00
• 906c2af1c0 - TmpGetSelfInfo gazebo 2018-09-21 16:13:50 +08:00
• c8107677c4 - must receive all result in task.go gazebo 2018-09-21 15:42:39 +08:00
• 4192e9c635 - don't check weixin exist after login in. gazebo 2018-09-21 15:35:02 +08:00
• edd5bfed26 - make weixins.openid nullable. gazebo 2018-09-21 11:07:03 +08:00
• 804c9c146c - refactor partner. gazebo 2018-09-21 10:57:00 +08:00
• d10869cef4 - dont't use JdRange2JxRange. gazebo 2018-09-21 09:56:05 +08:00
• 49a2d30f0e - remove JdRange2JxRange and JxRange2JdRange gazebo 2018-09-21 09:36:36 +08:00
• b58530ecd2 - limit GetStoreSkus result by sku_name_place_bind gazebo 2018-09-21 07:44:55 +08:00
• 4eb46bcbbe - alarm for shop price. - add index for ref_vendor_order_id. gazebo 2018-09-20 23:10:19 +08:00
• 4dd80436b9 - check sku status in GetStoreSkus. - ebai UpdateStore almost ok. gazebo 2018-09-20 22:26:37 +08:00
• d8b94650ea Merge remote-tracking branch 'origin/master' into jxstore gazebo 2018-09-20 21:49:56 +08:00
• 0a851a4385 - change wait time to 60 minuts before create 3rd waybill. - fix bug about OrderDeliveryFlagMaskScheduleDisabled. gazebo 2018-09-20 21:46:57 +08:00
• c0e179a3e0 - fix bug placeBind := &model.SkuNamePlaceBind{} gazebo 2018-09-20 18:07:00 +08:00
• 1027586cd5 - disable 3rd carries schedule. gazebo 2018-09-20 17:57:45 +08:00
• d8eb17f6be - fk gazebo 2018-09-20 17:02:25 +08:00
• 1fa6540f19 - fix bug in UpdateEntityLogically gazebo 2018-09-20 12:24:24 +08:00
• 582b4c9722 - fix GetStores bug. - isFocus on sku name. gazebo 2018-09-20 12:06:06 +08:00
• 65e5587cba - UpdateStoreSkus gazebo 2018-09-20 11:24:17 +08:00
• 2177707034 - fix bug in GetStoreSkus gazebo 2018-09-20 10:35:55 +08:00
• 9d88344ddb - Store and StoreMap add DeletedAt. gazebo 2018-09-20 10:07:58 +08:00
• f874c37d14 - ebai store. gazebo 2018-09-19 23:00:47 +08:00
• 3ddcf2f82c - return and receive coord as float. gazebo 2018-09-19 20:59:03 +08:00
• 7a3e766394 - return store sku info CUL not sku. gazebo 2018-09-19 18:37:06 +08:00
• 528ff80d4a - fk. gazebo 2018-09-19 17:19:29 +08:00
• 46f5a89da0 - GetRow gazebo 2018-09-19 17:15:58 +08:00
• e7c5e5c143 - set parentid = -1 when create weixins. gazebo 2018-09-19 16:56:22 +08:00
• b46461e62e - fk. gazebo 2018-09-19 15:10:20 +08:00
• f101f373aa - fk. gazebo 2018-09-19 14:49:07 +08:00
• a8681d57e4 - make openid null, createUserAndSetOpenIDNull gazebo 2018-09-19 14:38:27 +08:00
• 4e2c633a7f - verifyMobileHasNoMembers. gazebo 2018-09-19 12:03:03 +08:00
• 5d8017f4a6 - auto create weixin user. gazebo 2018-09-19 11:30:57 +08:00
• 57b60208e2 - GetPlaces support keyword. gazebo 2018-09-19 09:56:45 +08:00
• 8593e8b44b - ReorderCategories gazebo 2018-09-18 22:58:15 +08:00
• 7e0a58d801 - ReorderCategories gazebo 2018-09-18 22:38:35 +08:00
• 6299c1e61f - GetCategories order by level, seq gazebo 2018-09-18 22:36:29 +08:00
• cfe296fd6e - fix num in UpdateStoreSku. gazebo 2018-09-18 22:01:17 +08:00
• cdcac5ffb4 - store sku unit price. gazebo 2018-09-18 21:45:16 +08:00
• cf62db7ff5 - GetVendorStore for ebai. gazebo 2018-09-18 17:15:41 +08:00
• 5430791437 - fk. gazebo 2018-09-18 14:13:08 +08:00
• 5d4705ce1d - remove bee go All limit. gazebo 2018-09-18 14:08:33 +08:00
• 9a780b10d3 - bare store name. gazebo 2018-09-18 11:11:20 +08:00
• 23ff663492 - GetVendorCategories gazebo 2018-09-18 10:35:47 +08:00
• 4102e05ac7 - avoid null when isFocused is false. gazebo 2018-09-18 09:43:29 +08:00
• d592b4c29c - add isFocused cond for GetStoreSkus. gazebo 2018-09-18 09:32:32 +08:00