Commit Graph

75 Commits

Author SHA1 Message Date
gazebo
d4ec1dd0f3 - try exported table first in GetOrderSkuInfo 2018-10-28 14:10:58 +08:00
gazebo
a188f48253 - call GetJxStoreIDFromOrder at first place 2018-10-28 13:36:42 +08:00
gazebo
6abc2d694e - order by order_created_at DESC for GetOrders 2018-10-23 21:00:28 +08:00
gazebo
b51ceb3d1d - add jxcontext.Context to all public API. 2018-10-21 22:41:11 +08:00
gazebo
105a1271b7 - resotre time2Schedule3rdCarrier to 30 minutes. 2018-10-21 09:49:36 +08:00
gazebo
2308abb775 - time2Schedule3rdCarrier changed from 30 to 15 minutes for JD 1220. 2018-10-20 10:53:15 +08:00
gazebo
507fcf16d8 - refactor basesch, move register partner to partner. 2018-10-18 21:18:38 +08:00
gazebo
e56eb69b09 - orderUseNewTable almost ok. 2018-10-17 16:53:01 +08:00
gazebo
9c125a61a0 - OrderUseNewTable 2018-10-17 14:33:47 +08:00
gazebo
9f3624c777 - orderUseNewTable except store feature related. 2018-10-17 14:28:49 +08:00
gazebo
d7de24715b - remove useless legacy codes.
- refactor models
2018-10-16 10:47:44 +08:00
gazebo
df19812e97 - formalize pageSize. 2018-10-15 16:20:06 +08:00
gazebo
a96e0f4d9f - GetWaybills. 2018-10-12 15:59:13 +08:00
gazebo
6133998e54 - no platform dependency in sync.go 2018-10-11 22:17:20 +08:00
gazebo
d23f36a109 - handle [] in GetOrders 2018-10-10 11:34:31 +08:00
gazebo
3a96150c3e - add cities in GetOrders. 2018-10-10 10:16:54 +08:00
gazebo
a8c35c2448 - fix SelfDeliverDelievering to SelfDeliverDelivering. 2018-10-09 17:42:14 +08:00
gazebo
a288ce2213 - ignore vendorSkuID -70000 for alarm. 2018-10-09 17:37:36 +08:00
gazebo
c8a0f9b59f - GetOrders. 2018-10-09 17:09:34 +08:00
gazebo
7f2d829914 - use new jx to process jd bad comment and elm urge order 2018-10-09 10:14:28 +08:00
gazebo
86aae76980 - fix key name for ExportMTWaybills 2018-09-30 19:18:00 +08:00
gazebo
d0df68740e - ExportMTWaybills
- Obj2Excel
2018-09-30 18:58:05 +08:00
gazebo
3e336b1f33 - use eb_sku_id_map to get jx skuid for elm. 2018-09-30 07:27:08 +08:00
gazebo
40affb2707 - recalculate order.Weight when platform not give 2018-09-28 12:10:30 +08:00
gazebo
d81e8e1644 - handle VendorIDEBAI. 2018-09-28 10:51:00 +08:00
gazebo
8100e4c626 Merge remote-tracking branch 'origin/master' into jxstore 2018-09-27 10:08:10 +08:00
gazebo
dd2eb743cb - change time2Schedule3rdCarrier to half an hour. 2018-09-21 16:51:00 +08:00
gazebo
4192e9c635 - don't check weixin exist after login in. 2018-09-21 15:35:02 +08:00
gazebo
4eb46bcbbe - alarm for shop price.
- add index for ref_vendor_order_id.
2018-09-20 23:10:19 +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
1027586cd5 - disable 3rd carries schedule. 2018-09-20 17:57:45 +08:00
gazebo
5d8017f4a6 - auto create weixin user. 2018-09-19 11:30:57 +08:00
gazebo
fc05f326b7 - store man almost ok. 2018-09-09 12:32:24 +08:00
gazebo
8c130a15a4 - all db orm use beego orm, don't use gorm anymore. 2018-09-08 12:55:39 +08:00
gazebo
8add72eb34 ! remove all non order code. 2018-09-07 16:57:04 +08:00
gazebo
07006742cc Merge branch 'master' into jxstore 2018-09-07 11:51:21 +08:00
gazebo
686256be3e - change price store to 100961/163183405. 2018-09-07 10:37:34 +08:00
gazebo
88e1ba29e7 Merge branch 'master' into jxstore 2018-09-05 23:20:41 +08:00
gazebo
c52e8deade - fix calculateOrderDeliveryFee bug for weight. 2018-09-05 22:48:15 +08:00
gazebo
0faaa6b366 - mobile sms verify added. 2018-09-05 18:03:53 +08:00
gazebo
ad6cabe89d - localpass added. 2018-09-05 10:04:00 +08:00
gazebo
deca8efb96 - auth for weixin. 2018-09-04 21:23:51 +08:00
gazebo
5966b397d0 - weixinsns. 2018-09-04 15:54:51 +08:00
gazebo
0f68d904bd - treat DeliveryStatusFailedGetGoods as WaybillStatusFailed for jd waybill
- adjust defsch.
2018-08-29 21:37:48 +08:00
gazebo
55ef8e9ea3 - fix sync LockStatus bug in orderman.addOrderStatus. 2018-08-28 13:57:40 +08:00
gazebo
f7e655ec6b - add refresh param for api GetStoreOrderInfo to get realtime CurrentConsigneeMobile. 2018-08-27 14:31:11 +08:00
gazebo
9e515aff68 - enable store sku bind warning for 100928 and 100929. 2018-08-27 11:53:26 +08:00
gazebo
ffd85f9366 - fk3 2018-08-24 17:01:58 +08:00
gazebo
4dcd8b0fb8 - fk2. 2018-08-24 16:04:06 +08:00