Commit Graph

  • 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
  • ef9739f00c - make PromotionStore and PromotionSku ModelIDCULD gazebo 2018-11-05 17:02:34 +08:00
  • 95e6ab402e - disable token check on non prod server. gazebo 2018-11-05 16:10:49 +08:00
  • 5cfae50cc7 - fix bug in CancelJdPromotion gazebo 2018-11-05 15:50:48 +08:00
  • f24a9d6bb6 - update local status when cancel promotion successfully gazebo 2018-11-05 15:34:22 +08:00
  • 7c07d65c48 - refactor mysql transaction gazebo 2018-11-05 15:22:30 +08:00
  • cf4bfb3dd8 - get and cancel promotion gazebo 2018-11-05 15:08:30 +08:00
  • 34c74cd40a - fk gazebo 2018-11-05 09:13:09 +08:00
  • 0eec70cce5 - use json to serialize promotion params. - remove CreatePromotionByExcel gazebo 2018-11-05 08:58:15 +08:00
  • 3334466e70 - ErrStoreHaveNoCourier for getMTPSShopID gazebo 2018-11-03 12:52:14 +08:00
  • e6e28acb14 - trim possible semicolon in jd deliveryRange gazebo 2018-11-02 23:26:55 +08:00
  • cf10eb777e - fix GetStores search by mobile gazebo 2018-11-02 22:59:42 +08:00
  • 57ad34bb19 - enable token check. gazebo 2018-11-02 15:20:04 +08:00
  • 2376db722c - don't warning in jxcontext.New gazebo 2018-11-02 14:28:35 +08:00
  • 386ac29ad7 - TrimBlanChar to TrimBlankChar - error_code.go gazebo 2018-11-02 14:11:32 +08:00
  • addb300b1a - fix bug in GetUserInfo and GetSelfInfo - need token for SendMobileVerifyCode gazebo 2018-11-02 09:07:59 +08:00
  • 2336ad2ba4 - fix bug in CopyStoreSkus from and to are same, and specified category gazebo 2018-11-01 23:31:46 +08:00
  • 6db51d4093 - jd StockIsHave callback. gazebo 2018-11-01 20:38:55 +08:00
  • 6d98034c13 - NewWithUserName gazebo 2018-11-01 20:18:27 +08:00
  • 1e56ec2460 - fk. gazebo 2018-11-01 19:32:07 +08:00
  • 0428e3580f - output warning on prod when token is invliad. gazebo 2018-11-01 19:24:27 +08:00
  • df54e49bcd - change excel show url. gazebo 2018-11-01 18:43:40 +08:00
  • 24ad82e222 - don't call createWaybillOn3rdProviders on event WaybillStatusAcceptCanceled gazebo 2018-11-01 15:23:34 +08:00
  • ea7c6e51d4 - get place code from autonavi api if necessary. gazebo 2018-11-01 15:01:02 +08:00
  • a26a1d1ee9 - update jd_sync_status in batch. jd SyncStoreSkus gazebo 2018-11-01 13:51:06 +08:00
  • 8239f726b3 - .SetIsContinueWhenError(true) in SendFilesToStores gazebo 2018-11-01 09:31:19 +08:00
  • 541a61e953 - retry 3 times in SendFilesToStores. gazebo 2018-11-01 09:22:08 +08:00
  • 3b1256876c - revert to correct excel ext in SendFilesToStores. gazebo 2018-11-01 07:54:00 +08:00
  • 1ad4df80d2 - CopyStoreSkus support fromStore and toStore are same. gazebo 2018-11-01 01:29:30 +08:00
  • 65cfc85911 - comment gazebo 2018-11-01 01:00:23 +08:00
  • df573894d1 - don't delete and insert in CopyStoreSkus. gazebo 2018-11-01 00:35:02 +08:00
  • ccac26e412 - avoid create same user in BindMobile gazebo 2018-10-31 23:05:12 +08:00
  • 318cbdad7b - fk. gazebo 2018-10-31 22:48:07 +08:00