Commit Graph

172 Commits

Author SHA1 Message Date
gazebo
0f9949d73d - fix bug when get OrderManager.GetOrders when orderID given 2019-02-16 18:19:58 +08:00
gazebo
2315a5cf85 - debug msg for CreateOrderFromOriginal 2019-02-16 18:01:13 +08:00
gazebo
594a28b493 - disable warning in updateOrderSkuOtherInfo when order is not fresh. 2019-02-16 17:33:39 +08:00
gazebo
7c807be47d - more accurate error msg when failed create all waybill in CreateWaybillOnProviders 2019-02-16 16:50:27 +08:00
gazebo
7c8a3e7988 - up 2019-02-15 15:17:43 +08:00
gazebo
393a38192e - use GoodsOrder.PickDeadline to set auto pick timer, resetTimer 2019-02-15 15:15:11 +08:00
gazebo
f79c4b098d - change error description in CreateWaybillOnProvidersEx 2019-02-14 15:34:32 +08:00
gazebo
ddbedfc680 - don't set OrderDeliveryFlagMaskPurcahseDisabled in DefScheduler.CreateWaybillOnProvidersEx 2019-02-14 14:40:29 +08:00
gazebo
26abd517f8 - don't judge DeliveryFlag in swtich2SelfDeliverWithRetry
- fix dada shop already exist error
2019-02-14 14:30:49 +08:00
gazebo
64d605d6e9 - fix bug in CreateWaybillOnProvidersEx and SelfDeliveringAndUpdateStatus 2019-02-14 12:30:36 +08:00
gazebo
7c80ca2352 - debug in CreateWaybillOnProvidersEx 2019-02-14 12:17:59 +08:00
gazebo
e9deb4ef6b - autoload order in DefScheduler.CreateWaybillOnProvidersEx 2019-02-14 12:07:20 +08:00
gazebo
446dc061fa - add param forceCreate for CreateWaybillOnProviders
- fix error msg bug in BaseScheduler.CreateWaybillOnProviders
2019-02-14 10:53:45 +08:00
gazebo
65000be3d0 - remove enableStore and orderUseNewTable related stuff 2019-02-12 15:11:30 +08:00
gazebo
ced25499c4 - add SaveOrder to IOrderManager
- add Map2Order to IPurchasePlatformHandler
2019-02-12 14:30:16 +08:00
gazebo
09b2a14f4a - fix bug in CreateWaybillOnProvidersEx(forget return bills and err) 2019-01-31 09:48:47 +08:00
gazebo
946164d138 - CreateWaybillOnProvidersEx use all possible courier vendor(not just MTPS). 2019-01-29 10:44:38 +08:00
gazebo
9ed9175938 - tiny refactor 2019-01-29 09:36:58 +08:00
gazebo
a7167de7bf - order/GetOrders new param:orderID 2019-01-28 15:05:48 +08:00
gazebo
3787eabfc3 - only delete temp password whecn bind successfully 2019-01-28 14:32:45 +08:00
gazebo
33199f8dc8 - fk 2019-01-28 14:17:07 +08:00
gazebo
34533022c5 - BindMiniProgram bind mini program directly. 2019-01-28 14:06:21 +08:00
gazebo
bc1ac33874 - BindMiniProgram 2019-01-28 12:26:26 +08:00
gazebo
eaee327de2 - debu 2019-01-28 11:11:05 +08:00
gazebo
7e0ca7afef - debug 2019-01-28 11:09:44 +08:00
gazebo
0fb0653818 Merge branch 'master' into jxstore 2019-01-27 19:13:30 +08:00
gazebo
f2e8b48f8e - restore new weixin msg to on new order msg 2019-01-27 19:12:36 +08:00
gazebo
51dd016bac - fix bug in getSNSInfoFromCache 2019-01-26 16:34:23 +08:00
gazebo
aba16383fe - refactor weixin and mini program login 2019-01-26 16:02:01 +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
547447caad - handle weimob order correctly in orderman_ext 2019-01-25 12:28:46 +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
bd92371e84 - wsc schedule. 2019-01-24 18:19:38 +08:00
gazebo
3a0f47790f - refactor order deliveryType 2019-01-23 18:31:34 +08:00
gazebo
dcf2072efa - debug msg for auth 2019-01-23 11:17:08 +08:00
gazebo
d0bed4f40a - refactor GetJxStoreIDFromOrder
- add IsOrderPlatformWaybill
2019-01-22 10:19:37 +08:00
gazebo
64f2c371af - wsc 2019-01-21 22:46:46 +08:00
gazebo
670283a152 - comment 2019-01-21 17:08:53 +08:00
gazebo
35b39816b3 - remove a space 2019-01-20 10:14:51 +08:00
gazebo
51196380ce - TestMobile 91112345678 added to VerifyCode 2019-01-14 14:12:17 +08:00
gazebo
a64c024dd8 - GetOrderSkuInfo don't append sku spec if already existed 2019-01-11 22:17:11 +08:00
gazebo
d0e6de4e12 - OrderSkuExt.FullSkuName 2019-01-10 10:52:48 +08:00
gazebo
b6f1dc8721 - GoodsOrder.ConsigneeMobile2 for real user mobile. 2019-01-08 18:21:50 +08:00
gazebo
6b454d4e85 - avoid update other fields in BindWeiXin 2018-12-29 15:47:08 +08:00