Commit Graph

1121 Commits

Author SHA1 Message Date
gazebo
ab53a4b61d - wsc order expectDeliveryTime 2019-01-26 10:31:08 +08:00
gazebo
c3b8d54602 - set wsc order BusinessType to BusinessTypeImmediate 2019-01-26 10:18:26 +08:00
gazebo
574c68e479 - fk 2019-01-26 09:26:06 +08:00
gazebo
9ef7ead456 - fk 2019-01-26 09:18:09 +08:00
gazebo
b413a76bb1 - fk 2019-01-26 09:13:48 +08:00
gazebo
a3ee632843 - set correct OrderSeq for wsc order 2019-01-26 09:07:23 +08:00
gazebo
9f6d96f912 - return platform id and sync status in GetStore 2019-01-25 17:57:50 +08:00
gazebo
fcdc373848 - refactor order status for weimob 2019-01-25 17:05:58 +08:00
gazebo
088b613905 - first update shop id, then status, then other property for ebai shop, because shop property can not be changed after approved 2019-01-25 16:13:48 +08:00
gazebo
d6adfb23cc - fk 2019-01-25 15:28:06 +08:00
gazebo
a06c285c96 - fk 2019-01-25 15:26:14 +08:00
gazebo
f5bbd7914d - fix bug in GetStoreDeliveryType 2019-01-25 14:53:43 +08:00
gazebo
66121f135e - fk 2019-01-25 14:50:09 +08:00
gazebo
a322256a44 - move NotifyNewOrder for OnOrderNew to handleAutoAcceptOrder(to avoid send auto rejected order) 2019-01-25 14:41:37 +08:00
gazebo
0af50522a1 - try to fix index out of range bug in AddStoreVendorMap. 2019-01-25 14:16:02 +08:00
gazebo
547447caad - handle weimob order correctly in orderman_ext 2019-01-25 12:28:46 +08:00
gazebo
f3b7a0e84e ! format func EarthDistance params from lat, lng1... to lng1, lat1... 2019-01-25 11:41:33 +08:00
gazebo
367fff9321 - debug wsc.arrangeSaleStore 2019-01-25 11:28:50 +08:00
gazebo
028fe25424 - DeliveryOrder in wsc 2019-01-25 10:59:10 +08:00
gazebo
963d2e2622 - only set status.Status = model.OrderStatusNew when status.Status > model.OrderStatusNew in OnOrderNew 2019-01-25 10:26:21 +08:00
gazebo
8100e2be88 - add new order status OrderStatusWait4Pay
- handle weimob wsc order status OrderStatusWait4Pay
2019-01-25 09:14:40 +08:00
gazebo
052170c1cb - create dada store as BusinessTypeConvStore 2019-01-24 21:41:09 +08:00
gazebo
bd92371e84 - wsc schedule. 2019-01-24 18:19:38 +08:00
gazebo
ac291b287c - refactor temp op 2019-01-24 17:58:00 +08:00
gazebo
ee5f522be3 - debug 2019-01-24 16:23:48 +08:00
gazebo
aabfe99fdd - update wsc editStockNum correctly 2019-01-24 16:08:44 +08:00
gazebo
0379b59a24 - update WscID2 in SyncStoreSkus 2019-01-24 15:42:09 +08:00
gazebo
9c3bb08834 - dao.SetStoreCategorySyncStatus
- call SetStoreCategorySyncStatus in wsc.FullSyncStoreSkus
2019-01-24 15:25:52 +08:00
gazebo
8903eafb67 - fix Str2Int64 error in wsc.SyncStoreSkus 2019-01-24 15:16:49 +08:00
gazebo
16a3261bd1 - refactor CalculateOrderDeliveryFee
- use QueryDeliverFee and AddOrderAfterQuery for dada
2019-01-24 14:34:49 +08:00
gazebo
3bceb5b6b0 - return UpdateEntity error in SyncSku 2019-01-24 10:53:55 +08:00
gazebo
20500cf1db - set weimobapi client timeout to 120 seconds to upload img. 2019-01-24 10:52:59 +08:00
gazebo
3cc9433b46 - add param nameIDs to UploadWeimobImg4SkuName 2019-01-24 10:52:24 +08:00
gazebo
55385ab563 - change SendFilesToStores.title to optional. 2019-01-23 19:59:57 +08:00
gazebo
3a0f47790f - refactor order deliveryType 2019-01-23 18:31:34 +08:00
gazebo
fb894c94f8 - don't limit sku status in GetStoreSkus
- add deleted_at limit for some func
2019-01-23 15:22:50 +08:00
gazebo
7882fac0fd - miss use table store_courier_map in GetMissingDadaStores 2019-01-23 14:31:08 +08:00
gazebo
84d696fbe5 - up 2019-01-23 14:06:33 +08:00
gazebo
148b64f659 - avoid "Transaction has already been committed or rolled back" in RefreshMissingDadaStores 2019-01-23 14:02:58 +08:00
gazebo
083c837a78 - fk 2019-01-23 12:01:40 +08:00
gazebo
97407eb339 - fk 2019-01-23 11:29:23 +08:00
gazebo
dcf2072efa - debug msg for auth 2019-01-23 11:17:08 +08:00
gazebo
d745e3899c - RefreshMissingDadaStores
- auto acreate dada store when link jd store
2019-01-23 11:08:42 +08:00
gazebo
c354b28960 - upc for jd UpdateSkuBaseInfo 2019-01-22 17:20:13 +08:00
gazebo
a8a047d577 - fix bug, we place upc on skuname, but jd is on sku 2019-01-22 16:49:36 +08:00
gazebo
41165851db - change beta jd token 2019-01-22 15:23:44 +08:00
gazebo
1bd26ec1fb - change all msg to miniprogram. 2019-01-22 14:52:43 +08:00
gazebo
a051912b20 - arrange weimob wsc order (to local store) 2019-01-22 14:45:24 +08:00
gazebo
d0bed4f40a - refactor GetJxStoreIDFromOrder
- add IsOrderPlatformWaybill
2019-01-22 10:19:37 +08:00
gazebo
d21bdd4aec - enable miniprogram test store 2019-01-21 23:13:36 +08:00