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 |
|
gazebo
|
d937d12cda
|
- fk
|
2019-03-08 12:19:30 +08:00 |
|
gazebo
|
38246bdf43
|
- DingDingOAuth2
|
2019-03-08 11:44:11 +08:00 |
|
gazebo
|
2589c13ab1
|
- ddqrcode
|
2019-03-08 10:54:56 +08:00 |
|
gazebo
|
d633a35a26
|
- qrcode auth for dingding
|
2019-03-08 10:52:02 +08:00 |
|
gazebo
|
9a071dcbbe
|
- param isBySku added for GetStoreSkus
|
2019-03-08 09:22:36 +08:00 |
|
gazebo
|
ce109a60b3
|
- dingding auth
|
2019-03-07 21:15:19 +08:00 |
|
gazebo
|
123ffd4353
|
- param isBySku added for GetSkuNames
|
2019-03-07 09:54:37 +08:00 |
|
gazebo
|
d1237af716
|
- make lastOrderTime and lastOrderSeqID optional
|
2019-03-06 16:36:44 +08:00 |
|
gazebo
|
acc3cd5731
|
- new field GoodsOrder.Flag
- SetOrderPrintStatus
|
2019-03-06 12:22:41 +08:00 |
|
gazebo
|
887eeafa9f
|
- createdBy params added for GetTasks
|
2019-03-06 11:15:18 +08:00 |
|
gazebo
|
ccf9a4d6b9
|
- first edition of long pulling
|
2019-03-05 22:35:20 +08:00 |
|
gazebo
|
8910ab8b05
|
- debug redirectURL
|
2019-03-05 15:36:15 +08:00 |
|
gazebo
|
8a1425c4d0
|
- authType userID2 to userid2
|
2019-03-05 12:06:24 +08:00 |
|
gazebo
|
a8e92dd92e
|
- jxcontext.New
|
2019-03-05 11:18:30 +08:00 |
|
gazebo
|
273c50f6b7
|
- remove user2.ChangeMobile (use auth2.AddAuthBind instead)
|
2019-03-05 10:24:42 +08:00 |
|
gazebo
|
083f9ccbcf
|
- set correct authIDType when calling auth2.Login
|
2019-03-04 17:50:16 +08:00 |
|
gazebo
|
4071308185
|
- more detail error info 4 RegisterUser
|
2019-03-04 17:25:29 +08:00 |
|
gazebo
|
9a581f1eba
|
- v2 ChangeMobile
|
2019-03-04 14:36:00 +08:00 |
|
gazebo
|
d67f09007d
|
- add GetBindAuthInfo
|
2019-03-04 12:01:59 +08:00 |
|
gazebo
|
dce28f4aa0
|
- fullfill ChangePassword
|
2019-03-04 11:39:11 +08:00 |
|
gazebo
|
b57e698df8
|
- SendVerifyCode add params authToken
|
2019-03-04 11:31:02 +08:00 |
|
gazebo
|
6793e7443d
|
- user2
|
2019-03-03 22:20:07 +08:00 |
|