Commit Graph

314 Commits

Author SHA1 Message Date
gazebo
1ef854a0c6 - 将URL信息放到配置文件中 2019-04-25 12:13:01 +08:00
gazebo
d9276e5833 - ForceSyncSkuNames to SyncSkuNames 2019-04-25 08:54:40 +08:00
gazebo
7951e949c1 + ForceSyncSkuNames
- refactor sync.SyncSku
2019-04-24 21:36:55 +08:00
gazebo
7f406414b1 - 京东回调,非生产环境一定返回成功 2019-04-24 20:13:17 +08:00
gazebo
0a3a0d3266 - AgreeOrRefuseCancel 2019-04-23 15:24:44 +08:00
gazebo
58b299de2c - GetStoreOrderCountInfo2 2019-04-23 09:35:54 +08:00
gazebo
f1e900dbd5 + AcceptOrRefuseFailedGetOrder
+ CallPMCourier
+ ConfirmReceiveGoods
2019-04-22 17:59:55 +08:00
gazebo
976d02727b - 去掉重复函数GetGetStoreOrderInfo
- GetOrders中将orderID改为vendorOrderID
2019-04-19 10:06:47 +08:00
gazebo
77c92c2dbd - tempop.RetrieveEbaiShopLicence 2019-04-17 14:42:40 +08:00
gazebo
5e3bd659c9 - cms.GetStoresSkus 2019-04-15 14:33:22 +08:00
gazebo
2747e6f1c5 - remove agentId from dingapi.Sign 2019-04-15 13:31:11 +08:00
gazebo
b6468297a1 - ddapi.Sign 2019-04-15 12:42:43 +08:00
gazebo
99f675fcb4 - fix StoreOrderFinishedPickup to OrderFinishedPickup for mtwm 2019-04-14 17:03:31 +08:00
gazebo
bb02e6fe9e - AdjustOrder
- CancelOrder
2019-04-14 17:01:29 +08:00
gazebo
89e076343d - test mtwm.MsgTypeOrderFinishedPickup 2019-04-14 16:28:20 +08:00
gazebo
77c5a16c08 - 接收门店状态消息,本地同步状态,京东暂时无效 2019-04-12 16:22:22 +08:00
gazebo
f3939687ed - ebai.OnCallbackMsg中要判断事件后才会调用GetOrderIDFromMsg 2019-04-11 19:46:05 +08:00
gazebo
53fa68d3ba - 饿百图片库管理 2019-04-11 14:39:45 +08:00
gazebo
6e3b9a8215 - 将微信的备注改为店名相关的信息 2019-04-11 11:59:04 +08:00
gazebo
927c6db248 Merge remote-tracking branch 'origin/lcw' into mark 2019-04-10 09:28:14 +08:00
gazebo
6c8117a953 - fk 2019-04-09 21:09:00 +08:00
gazebo
54a0cc216d - yilianyun printer added 2019-04-09 20:56:53 +08:00
renyutian
4a1b80261c Merge remote-tracking branch 'origin/mark' into lcw 2019-04-09 12:03:43 +08:00
gazebo
8c6b1bc067 - 重构打印机流程,添加“外卖管家”打印 2019-04-09 11:35:27 +08:00
gazebo
e61ae7a1b0 Merge branch 'master' into lcw 2019-04-04 12:37:14 +08:00
gazebo
66869ed853 - afterSaleBillStatus 2019-04-03 18:35:34 +08:00
renyutian
632aa6aa3d 结账第二期 2019-04-03 17:49:30 +08:00
gazebo
60de9f64bd + PrintOrder
+ GetPrinterStatus
2019-04-01 23:29:47 +08:00
gazebo
d1d056077d - 飞鹅打印机支持 2019-04-01 21:00:15 +08:00
gazebo
24af4bc330 - 重构RefreshOrderRealMobile 2019-03-28 15:09:23 +08:00
gazebo
51f736976d - CancelAll3rdWaybills添加isStopSchedule参数 2019-03-26 14:17:23 +08:00
gazebo
6cc6ee43bf - 自送订单不调用拣货完成API
- 在updateOrderStoreFeature中将order.DeliveryFlag落地
- 发送用户申请取消订单消息(当前只有饿百与京东有此事件)
2019-03-22 17:14:09 +08:00
gazebo
d8b7b41b01 - SplitSkuName don't use comment as name
- add DownloadFileByURL
- refactor UploadWeimobImg4SkuName
- ignore RefreshMissingDadaStores error
- add BuildSkuFromEbaiStore
2019-03-20 09:31:33 +08:00
gazebo
5c640c08c5 - OrderAccounting 2019-03-19 11:51:03 +08:00
gazebo
cf2dc1be14 - debug msg in auth and auth2 2019-03-18 16:16:56 +08:00
gazebo
4ef9b65299 - debug output redirectURL in GetWeiXinUserInfo 2019-03-18 15:36:16 +08:00
gazebo
efec73afc4 - call SyncStoreSkus synchronously in mtwm.FullSyncStoreSkus
- handle mtps except event in status event handler too (美团配送的运单异常事件会发到status的回调来)
2019-03-17 21:48:05 +08:00
gazebo
8346f30b86 - financial related msg 2019-03-15 16:51:09 +08:00
gazebo
b000fbb3e7 - AfterSaleBillStatus 2019-03-15 15:04:25 +08:00
gazebo
b9da868736 - TmpGetJxBadComments support only fetch fix order comment 2019-03-15 11:34:21 +08:00
gazebo
f8a488f1a4 - add param isAsync and isContinueWhenError for update store sku serial apis 2019-03-13 11:45:59 +08:00
gazebo
c46f1597f1 - refactor bad comment 2019-03-12 15:40:08 +08:00
gazebo
c8946137fd - auth2.GetTokenInfo兼容V1 token 2019-03-11 15:27:23 +08:00
gazebo
4455e51b3f - export auth2.GetTokenInfo 2019-03-11 14:50:25 +08:00
gazebo
7bcf5f228a - use state as block in DingDingOAuth2 2019-03-11 11:05:06 +08:00
gazebo
899e0d8362 - 调整到家“新增或修改门店消息” 2019-03-11 09:40:24 +08:00
gazebo
aeda2df6bd - authType for Login 2019-03-11 08:55:58 +08:00
gazebo
2e65154206 - v2 token format changed
- DisableUser
- clear all tokens when disable user
- handle ding ding user leave event
2019-03-09 20:59:18 +08:00
gazebo
4e9fc119dd - dingding callback msg 2019-03-09 12:51:55 +08:00
gazebo
47473bc54e - dingding callback 2019-03-09 11:04:44 +08:00