Commit Graph

522 Commits

Author SHA1 Message Date
gazebo
a60ca564fd - save jd bad comments in go. 2018-09-29 15:58:35 +08:00
gazebo
1b1006986f Merge branch 'master' into jxstore 2018-09-29 14:32:18 +08:00
gazebo
da2b91f342 - remove domain scaqda. 2018-09-29 06:46:36 +08:00
gazebo
528f9befd2 Merge branch 'master' into jxstore 2018-09-28 14:13:48 +08:00
gazebo
b00201bfca - jd token call back. 2018-09-28 14:13:28 +08:00
gazebo
d1c91c83ce - vfoodId 2018-09-28 12:25:24 +08:00
gazebo
6244dbec2f - change elm order vendorSkuID from vfoodId to id 2018-09-28 12:15:22 +08:00
gazebo
40affb2707 - recalculate order.Weight when platform not give 2018-09-28 12:10:30 +08:00
gazebo
64087ea640 - return proper msg for ebai. 2018-09-28 11:06:29 +08:00
gazebo
d81e8e1644 - handle VendorIDEBAI. 2018-09-28 10:51:00 +08:00
gazebo
8ba9abc3a5 - ebai order status. 2018-09-28 10:07:10 +08:00
gazebo
4d468f589a - ebai order_index. 2018-09-28 09:51:10 +08:00
gazebo
919a342665 - fix callback response. 2018-09-27 18:44:22 +08:00
gazebo
392b6ad813 - ebai callback. 2018-09-27 18:01:41 +08:00
gazebo
8100e4c626 Merge remote-tracking branch 'origin/master' into jxstore 2018-09-27 10:08:10 +08:00
gazebo
73a5f7241e - sync sku to ebai, still have bugs. 2018-09-26 22:30:19 +08:00
gazebo
49f2d0c969 - up 2018-09-26 15:50:23 +08:00
gazebo
b900bde0f5 - return no error in GetSelfInfo, when there is no such user. 2018-09-26 15:45:48 +08:00
gazebo
ba680cdf8e - use skuName price as unit price for storesku. 2018-09-26 12:18:59 +08:00
gazebo
7499018f11 - use millisecond as temp id. 2018-09-25 21:47:45 +08:00
gazebo
95d91e63dc - update jd store phone and mobile. 2018-09-25 18:26:48 +08:00
gazebo
a8974ff4a6 - UpdateEntityLogicallyAndUpdateSyncStatus for model.SyncFlagModifiedMask 2018-09-25 17:49:20 +08:00
gazebo
366634fc00 - add sync error descript. 2018-09-25 15:36:49 +08:00
gazebo
543e469eeb - keep store.id when CreateStore. 2018-09-25 11:35:50 +08:00
gazebo
604f232e60 - ebai 2018-09-23 23:35:33 +08:00
gazebo
b936d3354b - up. 2018-09-22 23:28:52 +08:00
gazebo
f21b4e614d - EnableStoreWrite for SyncSkusIDMap 2018-09-22 10:40:34 +08:00
gazebo
81089fb85c - category sync almost ok.
- refactor tasksch (isContinueWhenError)
2018-09-22 10:26:31 +08:00
gazebo
0623d31c71 - new err in SyncCategory 2018-09-21 17:00:28 +08:00
gazebo
7295c16367 - miss use err: in SyncSku 2018-09-21 16:57:34 +08:00
gazebo
dd2eb743cb - change time2Schedule3rdCarrier to half an hour. 2018-09-21 16:51:00 +08:00
gazebo
d74f47a1e6 - fk. 2018-09-21 16:40:39 +08:00
gazebo
6a4ca3a77a - filter null data in FilterMapByStructObject. 2018-09-21 16:30:06 +08:00
gazebo
906c2af1c0 - TmpGetSelfInfo 2018-09-21 16:13:50 +08:00
gazebo
c8107677c4 - must receive all result in task.go 2018-09-21 15:42:39 +08:00
gazebo
4192e9c635 - don't check weixin exist after login in. 2018-09-21 15:35:02 +08:00
gazebo
edd5bfed26 - make weixins.openid nullable. 2018-09-21 11:07:03 +08:00
gazebo
804c9c146c - refactor partner. 2018-09-21 10:57:00 +08:00
gazebo
d10869cef4 - dont't use JdRange2JxRange. 2018-09-21 09:56:05 +08:00
gazebo
49a2d30f0e - remove JdRange2JxRange and JxRange2JdRange 2018-09-21 09:36:36 +08:00
gazebo
b58530ecd2 - limit GetStoreSkus result by sku_name_place_bind 2018-09-21 07:44:55 +08:00
gazebo
4eb46bcbbe - alarm for shop price.
- add index for ref_vendor_order_id.
2018-09-20 23:10:19 +08:00
gazebo
4dd80436b9 - check sku status in GetStoreSkus.
- ebai UpdateStore almost ok.
2018-09-20 22:26:37 +08:00
gazebo
d8b94650ea Merge remote-tracking branch 'origin/master' into jxstore 2018-09-20 21:49:56 +08:00
gazebo
0a851a4385 - change wait time to 60 minuts before create 3rd waybill.
- fix bug about OrderDeliveryFlagMaskScheduleDisabled.
2018-09-20 21:46:57 +08:00
gazebo
c0e179a3e0 - fix bug placeBind := &model.SkuNamePlaceBind{} 2018-09-20 18:07:00 +08:00
gazebo
1027586cd5 - disable 3rd carries schedule. 2018-09-20 17:57:45 +08:00
gazebo
d8eb17f6be - fk 2018-09-20 17:02:25 +08:00
gazebo
1fa6540f19 - fix bug in UpdateEntityLogically 2018-09-20 12:24:24 +08:00
gazebo
582b4c9722 - fix GetStores bug.
- isFocus on sku name.
2018-09-20 12:06:06 +08:00