liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,637 Commits 4 Branches 0 Tags
a6dfc8dbda0c12e8c43ea7d3a3ba1a2ff787a363
Commit Graph

465 Commits

Author SHA1 Message Date
gazebo
b91fe783f6 - ebai.CmdOrderPartRefund的业务流程处理 2019-04-14 17:54:47 +08:00
gazebo
89e076343d - test mtwm.MsgTypeOrderFinishedPickup 2019-04-14 16:28:20 +08:00
gazebo
e33ab1d62a - add shop_close in ebai.onShopMsgPush 2019-04-14 12:43:38 +08:00
gazebo
caabbb4a66 - IPurchasePlatformHandler中添加 
AgreeOrRefuseRefund
CancelOrder
AdjustOrder
 2019-04-13 18:35:58 +08:00
gazebo
16725bf8f8 - 修改Rollback调用时机 
- 创建三方运单判断EnableStoreWrite
 2019-04-13 11:30:24 +08:00
XJH-Rosy
d9785939cd Accept Merge Request #12: (lcw -> mark) 
Merge Request: 修复一些报警
Created By: @XJH-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/12
 2019-04-12 17:55:47 +08:00
renyutian
211a9928e0 结账信息收到重复订单推送处理 2019-04-12 16:30:59 +08:00
gazebo
c968cfe109 - fk 2019-04-12 16:29:52 +08:00
renyutian
70876759a1 Merge remote-tracking branch 'origin/mark' into lcw 2019-04-12 16:26:16 +08:00
gazebo
77c5a16c08 - 接收门店状态消息，本地同步状态，京东暂时无效 2019-04-12 16:22:22 +08:00
renyutian
b342af3e7e 美团正向账单bug优化 skuid-->vendorskuid 2019-04-12 13:48:22 +08:00
gazebo
ca8d0b362b - 单门店同步商品时，只同步SKUNAME和SKU可售的 2019-04-12 11:16:39 +08:00
gazebo
06f92d952c - 处理美团外卖shipping/list返回的配送范围(area)有时是整数，有时是字符串的情况 2019-04-12 09:08:02 +08:00
gazebo
f3939687ed - ebai.OnCallbackMsg中要判断事件后才会调用GetOrderIDFromMsg 2019-04-11 19:46:05 +08:00
gazebo
5f9b2a08bb - 重构UploadImg 2019-04-11 16:19:28 +08:00
gazebo
660ff1e34c - 去掉ebai.GetAllRemoteSkus中一个冗长的调度输出 
- BaseTask marshal时忽略Result
 2019-04-11 15:49:41 +08:00
gazebo
53fa68d3ba - 饿百图片库管理 2019-04-11 14:39:45 +08:00
gazebo
ff52db6dd7 - 对于外卖管家打印机ESCAPE * 2019-04-11 09:58:54 +08:00
gazebo
f4e2d403dd - 打印订单格式调整 2019-04-11 09:46:58 +08:00
gazebo
83e0b698a8 - 中午云打印 2019-04-10 18:27:16 +08:00
gazebo
fc29cf8adc - 美团外卖SyncStoreSkus中，只处理与相应的skuIDs相关的分类信息 2019-04-10 17:36:12 +08:00
gazebo
62fdb4fa3f - 添加调试输出 2019-04-10 16:39:27 +08:00
gazebo
6ae25dc574 - 只有在prod环境下才刷新易联云token 2019-04-10 16:15:50 +08:00
gazebo
5236fdf90c - 易联云打印订单排版完成 2019-04-10 16:09:23 +08:00
gazebo
e0208f77e9 - 易联云打印格式完成 2019-04-10 15:35:12 +08:00
gazebo
aeca8901d8 - 同步门店商品时，以门店价格排序 2019-04-10 13:56:54 +08:00
gazebo
ac98b753ae - 校验外卖管家设备编号长度 2019-04-10 10:17:07 +08:00
gazebo
927c6db248 Merge remote-tracking branch 'origin/lcw' into mark 2019-04-10 09:28:14 +08:00
gazebo
a8ca896949 - 外卖管家READY 2019-04-10 09:26:43 +08:00
gazebo
54a0cc216d - yilianyun printer added 2019-04-09 20:56:53 +08:00
renyutian
4e567f1687 Merge remote-tracking branch 'origin/mark' into lcw 2019-04-09 15:19:28 +08:00
gazebo
6ccf2d984f - fk 2019-04-09 15:18:46 +08:00
renyutian
c5ef17afee ebai "delivery_party" 多类型处理 2019-04-09 13:58:09 +08:00
renyutian
2b221d0ea3 Merge remote-tracking branch 'origin/mark' into lcw 2019-04-09 13:55:41 +08:00
renyutian
8025bddf43 ebai msg.Timestamp 2019-04-09 12:04:56 +08:00
renyutian
4a1b80261c Merge remote-tracking branch 'origin/mark' into lcw 2019-04-09 12:03:43 +08:00
gazebo
48c36173bb - 外卖管理打印机添加完成 2019-04-09 12:03:18 +08:00
gazebo
8c6b1bc067 - 重构打印机流程，添加“外卖管家”打印 2019-04-09 11:35:27 +08:00
renyutian
1094c325fa 美团公益捐款优化 2019-04-08 15:07:10 +08:00
renyutian
976a7d0d76 结账报错优化 2019-04-08 11:27:56 +08:00
renyutian
48ab6f7e75 美团尝试 2019-04-04 17:58:08 +08:00
renyutian
7a3a914839 bug 优化 2019-04-04 17:02:48 +08:00
renyutian
18d7a24ba5 Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw 2019-04-04 14:52:42 +08:00
renyutian
d276ae55aa bug处理 2019-04-04 14:51:10 +08:00
gazebo
e61ae7a1b0 Merge branch 'master' into lcw 2019-04-04 12:37:14 +08:00
gazebo
5986c5ad17 - 饿百状态调整 2019-04-04 12:36:00 +08:00
renyutian
f28be52906 格式优化 2019-04-04 10:16:35 +08:00
renyutian
53733320c2 报错优化 2019-04-04 09:39:21 +08:00
gazebo
2c457a38d5 - 修改美团外卖门店要报错"商家已接入美团配送，不可修改门店配送相关信息"，还是只修改门店状态与营业时间 2019-04-03 20:42:02 +08:00
gazebo
2d54c5510e - up 2019-04-03 20:34:43 +08:00