Commit Graph

764 Commits

Author SHA1 Message Date
gazebo
86b50e5c66 - revert time2Schedule3rdCarrier = 30 * time.Minute 2018-11-12 10:19:33 +08:00
gazebo
8cea399565 - async call some funcs in scheduleRoutine to avoid blocking 2018-11-10 09:32:34 +08:00
gazebo
e664e9ea3f - time2Schedule3rdCarrier = 15 * time.Minute 2018-11-10 09:12:29 +08:00
gazebo
9bc5b083d8 - trim 来源 for jd promotion 2018-11-09 15:24:46 +08:00
gazebo
307cf55238 - nameID and skuID for GetSkuNames 2018-11-09 14:58:49 +08:00
gazebo
30e16ba636 - is_lock = 1 in RefreshJdLockStoreSku. 2018-11-09 11:14:13 +08:00
gazebo
390de4d5f7 - fix description of RefreshPromotionStatus 2018-11-09 10:19:03 +08:00
gazebo
534761f993 - RefreshPromotionStatus
- call UpdatePromotionStatusFromRemote in LockPromotionSkus.
2018-11-09 10:13:34 +08:00
gazebo
1313fefe0d - refactor GetSkuNames, remove skuID, nameID, jdID. add vendorSkuIDs. 2018-11-09 09:21:31 +08:00
gazebo
7ce06d275b - make OnNewPromotionMsg asnyc
- set limit... in CreateJdPromotion
- correct limitPint to limitPin
2018-11-08 17:49:57 +08:00
gazebo
7f8a7e7820 - set promotion status to PromotionStatusRemoteCreated when manually associated. 2018-11-08 16:44:30 +08:00
gazebo
69aad912cd - auto create jd promotion on jd new promotion event 2018-11-08 16:08:35 +08:00
gazebo
bd6cf367a0 - fix bug in verifyMobileIsBlank 2018-11-08 11:52:28 +08:00
gazebo
11f8ba1ecd - OnNewPromotionMsg 2018-11-08 11:27:31 +08:00
gazebo
1fd2305269 - fake SinglePromoteCreate 2018-11-08 11:04:21 +08:00
gazebo
b013d0ab53 - add remark on table promotion 2018-11-07 20:07:06 +08:00
gazebo
a5d22c3655 - handle special chars in store name. 2018-11-07 18:12:32 +08:00
gazebo
e5510db6ea - check vendorPromotionID in CreateJdPromotion 2018-11-07 14:47:09 +08:00
gazebo
741a55f7a2 - change isLock from bool to int for LockPromotionSkus 2018-11-07 14:27:09 +08:00
gazebo
88929a687c - format promotion to 活动 2018-11-07 14:09:32 +08:00
gazebo
8ad36d3095 - add Promotion CreateType 2018-11-07 14:04:58 +08:00
gazebo
73df0db1f8 - fix misplace params in RefreshJdPromotionLockStatus 2018-11-07 13:52:28 +08:00
gazebo
a5983d3e38 - run scheduleRoutine on startup 2018-11-07 13:36:07 +08:00
gazebo
62a7a57730 - call RefreshJdStoreSkuStock only isLock true in LockPromotionSkus 2018-11-07 13:23:28 +08:00
gazebo
9bb30affc4 - move Cacher from globals to api
- vendorPromotionID for CreatePromotion
- LockPromotionSkus
2018-11-07 13:17:25 +08:00
gazebo
ee9b84bd80 - handle level 1 leaf category in func GetSkuNames and GetStoreSkus 2018-11-07 11:28:02 +08:00
gazebo
297e72dc0f - isContinueWhenError for CreatePromotion 2018-11-07 11:19:17 +08:00
gazebo
4f5efcacb3 - fk 2018-11-07 10:23:14 +08:00
gazebo
a3cc68088f - fk 2018-11-07 09:56:53 +08:00
gazebo
1befa2805d - fix beginAt 2018-11-07 09:29:25 +08:00
gazebo
25a31efa06 - RefreshJdStoreSkuStock 2018-11-07 09:24:18 +08:00
gazebo
96c6c52571 - fix bug in promotion.OnStoreStockMsg 2018-11-06 22:23:31 +08:00
gazebo
3661ac61da - IsDuplicateError 2018-11-06 22:12:18 +08:00
gazebo
255b0c7655 - jd WmsMerchantStockChang 2018-11-06 19:23:35 +08:00
gazebo
e0cf85ebb6 - prevent modify promotion sku 2018-11-06 16:10:23 +08:00
gazebo
ae267dcdbe - prevent modify promotion store sku. lack callback handler 2018-11-06 14:36:21 +08:00
gazebo
d48b867dae - resend weixin msg when courier changed. 2018-11-06 09:34:44 +08:00
gazebo
434827abe6 - check status in CancelPromotion.
- return more accurate error in user related funcs
2018-11-06 08:34:23 +08:00
gazebo
ee5e7ffe18 - TryStr2Time 2018-11-05 22:04:28 +08:00
gazebo
594ca76de3 - PromotionStatusName 2018-11-05 19:02:10 +08:00
gazebo
42e96f3451 - return store name also. 2018-11-05 17:42:58 +08:00
gazebo
ef9739f00c - make PromotionStore and PromotionSku ModelIDCULD 2018-11-05 17:02:34 +08:00
gazebo
95e6ab402e - disable token check on non prod server. 2018-11-05 16:10:49 +08:00
gazebo
5cfae50cc7 - fix bug in CancelJdPromotion 2018-11-05 15:50:48 +08:00
gazebo
f24a9d6bb6 - update local status when cancel promotion successfully 2018-11-05 15:34:22 +08:00
gazebo
7c07d65c48 - refactor mysql transaction 2018-11-05 15:22:30 +08:00
gazebo
cf4bfb3dd8 - get and cancel promotion 2018-11-05 15:08:30 +08:00
gazebo
34c74cd40a - fk 2018-11-05 09:13:09 +08:00
gazebo
0eec70cce5 - use json to serialize promotion params.
- remove CreatePromotionByExcel
2018-11-05 08:58:15 +08:00
gazebo
3334466e70 - ErrStoreHaveNoCourier for getMTPSShopID 2018-11-03 12:52:14 +08:00