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

Commit Graph

  • 52b6798b44 - disable ebai update store deliveryRange when radius is too small gazebo 2018-11-19 14:30:33 +08:00
  • a2ce997a0b - when delete category or sku, delete store sku and store category info also. gazebo 2018-11-19 10:36:50 +08:00
  • 743f2c5588 - use ebai api to controll order flow. gazebo 2018-11-19 09:45:14 +08:00
  • ab5013e7a9 - return normal response when ebai msg missing status field. gazebo 2018-11-19 09:42:12 +08:00
  • f484c50dea - time2Schedule3rdCarrier = 20 * time.Minute gazebo 2018-11-18 10:35:33 +08:00
  • 241d1a586d - disable ebai 3rd party waybill. gazebo 2018-11-18 10:12:54 +08:00
  • 8e6760688e - fk gazebo 2018-11-17 13:37:31 +08:00
  • 3bde199eb8 - json.Number in postFakeFinishedPickupMsg gazebo 2018-11-17 13:28:15 +08:00
  • 5670c41bd9 - for ebai only zhuan song send fakefinishedpickup right after order accept msg gazebo 2018-11-17 13:04:25 +08:00
  • fd149d53de - EbaiDeliveryType2Jx changed. gazebo 2018-11-17 11:02:22 +08:00
  • a09f765f4a - disable elm accept order - delay accept order for ebai gazebo 2018-11-16 17:56:50 +08:00
  • 342f3e51ad - enable ebai AcceptOrRefuseOrder gazebo 2018-11-16 17:34:19 +08:00
  • ff7ac8d378 - ignore elm redstore error in UpdateStoreVendorMap gazebo 2018-11-16 16:45:05 +08:00
  • 2a82fc6975 - don't send weixin msg when ebai order - don't return ebai orders in GetStoreOrderInfo and GetStoreOrderCountInfo gazebo 2018-11-16 15:48:20 +08:00
  • 1ff2463768 - disable status field missing warning. gazebo 2018-11-16 13:23:42 +08:00
  • 254a8172d3 - set ebai delivery_region when there is non nil value. gazebo 2018-11-16 12:18:14 +08:00
  • 28b6689c56 - jxutils.IsLegalStoreID gazebo 2018-11-16 11:25:14 +08:00
  • 42f4c01c1e - Store.IsSync gazebo 2018-11-15 18:51:13 +08:00
  • 74d1a44306 - ebai waybill gazebo 2018-11-15 17:44:27 +08:00
  • 1f4e9f3813 - use math.Round in CaculateSkuVendorPrice gazebo 2018-11-15 10:12:02 +08:00
  • 91b0dd1b22 - disable send msg to me when storeID == 0 gazebo 2018-11-15 10:04:41 +08:00
  • 7d0279ba15 - more OrderStatusName and WaybillStatusName gazebo 2018-11-15 09:47:54 +08:00
  • 80d763b27f - check validation of jxstore in verifyMobileIsBlank gazebo 2018-11-14 20:16:05 +08:00
  • 1960d6e7cf - disable ebai warning gazebo 2018-11-14 20:06:33 +08:00
  • b821a89446 - constrain sku status is normal in ebai getDirtyStoreSkus gazebo 2018-11-14 16:29:15 +08:00
  • d4810cc870 - enable enableEbaiStoreWrite on prod - comment all ebai order write funcs. gazebo 2018-11-14 15:45:20 +08:00
  • 48f985a8be - enableElmStoreWrite gazebo 2018-11-14 15:42:58 +08:00
  • 0f8cb39ac3 - setStoreSkuSyncStatus gazebo 2018-11-14 15:34:43 +08:00
  • a84286df4f - handle ebai fake mobile(IsMobileFake) gazebo 2018-11-14 15:05:40 +08:00
  • 598659582d - time2Schedule3rdCarrier = 15 * time.Minute - maxAddFee = 300 gazebo 2018-11-14 14:28:36 +08:00
  • 933f491541 - IsContinueWhenError true for LoopStoresMap and LoopMultiStoresVendors gazebo 2018-11-14 12:26:56 +08:00
  • f9e8e4745a - trim store deliveryRange(possible additional ;) gazebo 2018-11-14 12:11:43 +08:00
  • ec1a3deee6 - fk gazebo 2018-11-14 10:39:01 +08:00
  • a679ef3f44 - merge storeID and cityCode for GetPromotions gazebo 2018-11-14 10:34:44 +08:00
  • 0e6c0d4a52 - fk gazebo 2018-11-14 10:22:49 +08:00
  • b370e4d158 - support cityCode in GetPromotions - promotion beginAt and endAt are time format(not just date format) gazebo 2018-11-14 10:16:52 +08:00
  • 9e0d3c7a59 - enable auto AcceptOrRefuseOrder for elm gazebo 2018-11-14 09:51:08 +08:00
  • 5ecbbab2a9 - disable ebai order warning gazebo 2018-11-14 07:38:51 +08:00
  • 4841592daa - fk ebai order_id,GetOrderIDFromMsg gazebo 2018-11-14 07:29:47 +08:00
  • 6c87c3eed4 - set ebai prod key gazebo 2018-11-13 22:36:54 +08:00
  • 3596ae9e8e - VendorOrderID2 for ebai order gazebo 2018-11-13 22:31:56 +08:00
  • 22eb6b76dd - FullSyncStoresSkus gazebo 2018-11-13 22:26:48 +08:00
  • b692f9adae - refactor ebai SyncStoreSkus gazebo 2018-11-13 19:12:21 +08:00
  • 70bcf0cec2 - refactor ebai SyncStoreSkus gazebo 2018-11-13 18:12:37 +08:00
  • f760685152 - disable auto accept order for elm. gazebo 2018-11-13 15:55:04 +08:00
  • f316fd4c1f - all ebai order msg order_id is tring - if store_id of ebai order larger than math.MaxInt32, set it to zero gazebo 2018-11-13 15:53:43 +08:00
  • b175895f8d - disable ebai prod gazebo 2018-11-13 12:48:46 +08:00
  • acbf6052d3 - up gazebo 2018-11-13 12:38:24 +08:00
  • 6cdeb33ff8 - GetStores: t1.id_card_front, t1.id_card_back, t1.id_card_hand, t1.licence, t1.licence_code, gazebo 2018-11-13 11:17:29 +08:00
  • 54ba8efd78 - ebaiapi.ShopBusStatusOffline --> model.StoreStatusDisabled gazebo 2018-11-13 11:13:46 +08:00
  • 993ce31b4d - get district code from coordinate if necessary for ebai store. gazebo 2018-11-13 10:21:03 +08:00
  • 84f79249c8 - new config param:EnableEbaiStoreWrite gazebo 2018-11-13 10:11:41 +08:00
  • 49b9d07153 - ebai prod key added. - TrimDecorationChar gazebo 2018-11-13 09:29:06 +08:00
  • 4d459380aa - LicenceCode added for store gazebo 2018-11-12 18:12:01 +08:00
  • 8200a756ea - force mtps cancel reason to empty. gazebo 2018-11-12 18:00:10 +08:00
  • f8f5f77fbf - skuCategoryID for GetSkuNames - change OrderStatusName and WaybillStatusName to Chinese name gazebo 2018-11-12 14:03:02 +08:00
  • b19661e261 - correct orderType for GetOrderStatusList gazebo 2018-11-12 13:42:05 +08:00
  • d436bc9153 - GetOrderEvents --> GetOrderStatusList gazebo 2018-11-12 12:05:20 +08:00
  • 920e6ba35a - GetOrderEvents - idcard and licence for store gazebo 2018-11-12 12:00:09 +08:00
  • 86b50e5c66 - revert time2Schedule3rdCarrier = 30 * time.Minute gazebo 2018-11-12 10:19:33 +08:00
  • 8cea399565 - async call some funcs in scheduleRoutine to avoid blocking gazebo 2018-11-10 09:32:34 +08:00
  • e664e9ea3f - time2Schedule3rdCarrier = 15 * time.Minute gazebo 2018-11-10 09:12:29 +08:00
  • 9bc5b083d8 - trim 来源 for jd promotion gazebo 2018-11-09 15:24:46 +08:00
  • 307cf55238 - nameID and skuID for GetSkuNames gazebo 2018-11-09 14:58:49 +08:00
  • 30e16ba636 - is_lock = 1 in RefreshJdLockStoreSku. gazebo 2018-11-09 11:14:13 +08:00
  • 390de4d5f7 - fix description of RefreshPromotionStatus gazebo 2018-11-09 10:19:03 +08:00
  • 534761f993 - RefreshPromotionStatus - call UpdatePromotionStatusFromRemote in LockPromotionSkus. gazebo 2018-11-09 10:09:13 +08:00
  • 1313fefe0d - refactor GetSkuNames, remove skuID, nameID, jdID. add vendorSkuIDs. gazebo 2018-11-09 09:21:31 +08:00
  • 7ce06d275b - make OnNewPromotionMsg asnyc - set limit... in CreateJdPromotion - correct limitPint to limitPin gazebo 2018-11-08 17:49:57 +08:00
  • 7f8a7e7820 - set promotion status to PromotionStatusRemoteCreated when manually associated. gazebo 2018-11-08 16:44:30 +08:00
  • 69aad912cd - auto create jd promotion on jd new promotion event gazebo 2018-11-08 16:08:35 +08:00
  • bd6cf367a0 - fix bug in verifyMobileIsBlank gazebo 2018-11-08 11:52:28 +08:00
  • 11f8ba1ecd - OnNewPromotionMsg gazebo 2018-11-08 11:27:31 +08:00
  • 1fd2305269 - fake SinglePromoteCreate gazebo 2018-11-08 11:04:21 +08:00
  • b013d0ab53 - add remark on table promotion gazebo 2018-11-07 20:07:06 +08:00
  • a5d22c3655 - handle special chars in store name. gazebo 2018-11-07 18:12:32 +08:00
  • e5510db6ea - check vendorPromotionID in CreateJdPromotion gazebo 2018-11-07 14:47:09 +08:00
  • 741a55f7a2 - change isLock from bool to int for LockPromotionSkus gazebo 2018-11-07 14:27:09 +08:00
  • 88929a687c - format promotion to 活动 gazebo 2018-11-07 14:09:32 +08:00
  • 8ad36d3095 - add Promotion CreateType gazebo 2018-11-07 14:04:58 +08:00
  • 73df0db1f8 - fix misplace params in RefreshJdPromotionLockStatus gazebo 2018-11-07 13:52:28 +08:00
  • a5983d3e38 - run scheduleRoutine on startup gazebo 2018-11-07 13:36:07 +08:00
  • 62a7a57730 - call RefreshJdStoreSkuStock only isLock true in LockPromotionSkus gazebo 2018-11-07 13:23:28 +08:00
  • 9bb30affc4 - move Cacher from globals to api - vendorPromotionID for CreatePromotion - LockPromotionSkus gazebo 2018-11-07 13:17:25 +08:00
  • ee9b84bd80 - handle level 1 leaf category in func GetSkuNames and GetStoreSkus gazebo 2018-11-07 11:27:42 +08:00
  • 297e72dc0f - isContinueWhenError for CreatePromotion gazebo 2018-11-07 11:19:17 +08:00
  • 4f5efcacb3 - fk gazebo 2018-11-07 10:23:14 +08:00
  • a3cc68088f - fk gazebo 2018-11-07 09:56:53 +08:00
  • 1befa2805d - fix beginAt gazebo 2018-11-07 09:29:25 +08:00
  • 25a31efa06 - RefreshJdStoreSkuStock gazebo 2018-11-07 09:24:18 +08:00
  • 96c6c52571 - fix bug in promotion.OnStoreStockMsg gazebo 2018-11-06 22:23:31 +08:00
  • 3661ac61da - IsDuplicateError gazebo 2018-11-06 22:12:18 +08:00
  • 255b0c7655 - jd WmsMerchantStockChang gazebo 2018-11-06 19:23:35 +08:00
  • e0cf85ebb6 - prevent modify promotion sku gazebo 2018-11-06 16:10:23 +08:00
  • ae267dcdbe - prevent modify promotion store sku. lack callback handler gazebo 2018-11-06 14:36:21 +08:00
  • d48b867dae - resend weixin msg when courier changed. gazebo 2018-11-06 09:34:44 +08:00
  • 434827abe6 - check status in CancelPromotion. - return more accurate error in user related funcs gazebo 2018-11-06 08:34:23 +08:00
  • ee5e7ffe18 - TryStr2Time gazebo 2018-11-05 22:04:28 +08:00
  • 594ca76de3 - PromotionStatusName gazebo 2018-11-05 19:02:10 +08:00
  • 42e96f3451 - return store name also. gazebo 2018-11-05 17:42:58 +08:00