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 |
|
gazebo
|
74b29acd4e
|
- change app info for weixin mini program.
|
2018-12-28 10:35:01 +08:00 |
|
gazebo
|
000ef7d6c3
|
- BindWeiXin
|
2018-12-28 10:04:38 +08:00 |
|
gazebo
|
5adc5e61f3
|
- mini program login
|
2018-12-27 16:49:32 +08:00 |
|
gazebo
|
b1a7cfdaa8
|
- because weixinsns removed.
|
2018-12-27 16:15:14 +08:00 |
|
gazebo
|
46f96fada8
|
- debug output in createWaybillOn3rdProviders
- disable ELM in CreateWaybillOnProviders.
|
2018-12-25 15:17:23 +08:00 |
|
gazebo
|
65b4e2bcb8
|
- handle jd order have illegal skuIdIsv value(more than max int32)
|
2018-12-23 12:21:37 +08:00 |
|
gazebo
|
c7577e6005
|
- dao.GetLastTotalRowCount
|
2018-12-21 11:07:18 +08:00 |
|
gazebo
|
cae7c6d372
|
- send different wx msg when mt changed courier
|
2018-12-17 11:53:12 +08:00 |
|
gazebo
|
20aff7cdd2
|
- allow create 3rd waybill when recieve ebai waybill cancel info.
|
2018-12-10 15:57:53 +08:00 |
|
gazebo
|
ad763b290b
|
- make defsch.time2Schedule3rdCarrier configable.
|
2018-12-10 11:00:21 +08:00 |
|
gazebo
|
421871334e
|
- saveOrder don't use unsuitable status.
|
2018-11-30 20:55:10 +08:00 |
|
gazebo
|
44a33a9d06
|
- handle vendorSkuID is not numeric in updateOrderSkuOtherInfo
|
2018-11-30 17:19:44 +08:00 |
|
gazebo
|
f2e45c24a8
|
- mtwm save order related status
|
2018-11-30 15:45:34 +08:00 |
|
gazebo
|
d47f1bd41b
|
- don't create 3rd waybill when order status is equal or larger than OrderStatusDelivering when received event WaybillStatusCanceled
|
2018-11-30 14:20:40 +08:00 |
|
gazebo
|
f8ff11d4f9
|
- ignore exceed fee when deliveryType is StoreDeliveryTypeByStore
|
2018-11-30 14:01:13 +08:00 |
|
gazebo
|
77266b8583
|
- new table GoodsOrderOriginal
|
2018-11-29 18:53:19 +08:00 |
|
gazebo
|
de110daf0b
|
- refactor updateOrderSkuOtherInfo using ConvertDBFieldPrefix
|
2018-11-28 20:04:58 +08:00 |
|
gazebo
|
4fbfcdb13e
|
- model.WaybillStatusNeverSend
- try to set ebai sku weight
|
2018-11-27 10:27:32 +08:00 |
|
gazebo
|
757db55928
|
- fix bug after 3rd waybill created then the boss switched to self delivery.
|
2018-11-25 18:37:27 +08:00 |
|
gazebo
|
334db9d62b
|
- only send ebai order info
|
2018-11-22 10:28:41 +08:00 |
|
gazebo
|
023bf19aba
|
- update waybill courier info only the value is not empty.
|
2018-11-20 12:21:50 +08:00 |
|
gazebo
|
78cbb75f3d
|
- scheduler.StoreDeliveryTypeName
|
2018-11-20 08:46:27 +08:00 |
|
gazebo
|
743f2c5588
|
- use ebai api to controll order flow.
|
2018-11-19 09:45:14 +08:00 |
|