gazebo
|
f4e2d403dd
|
- 打印订单格式调整
|
2019-04-11 09:46:58 +08:00 |
|
gazebo
|
79e6e30616
|
- GetStores时keyword查询printer_sn
|
2019-04-11 09:05:20 +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
|
0f38cadb5f
|
- 删除网络打印机时，修复printerVendorID为0的错误
|
2019-04-10 11:03:17 +08:00 |
|
gazebo
|
ac98b753ae
|
- 校验外卖管家设备编号长度
|
2019-04-10 10:17:07 +08:00 |
|
gazebo
|
771fda0914
|
- up
|
2019-04-10 09:58:26 +08:00 |
|
gazebo
|
f4b0dc1d92
|
- GetStores中返回printer_vendor_id
|
2019-04-10 09:33:25 +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
|
a8c4b6e675
|
- fix printer_vendor_i_d to printer_vendor_id
|
2019-04-10 09:06:37 +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
|
3cc5d7a8b6
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 17:50:31 +08:00 |
|
gazebo
|
3203201bc6
|
- 修复GetPossibleVendorIDFromVendorOrderID中的错误
|
2019-04-09 17:49:39 +08:00 |
|
renyutian
|
5a96290567
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 17:22:35 +08:00 |
|
gazebo
|
07f6b9d340
|
- 调用SelfDeliverDelivering要传骑手或店主手机号
|
2019-04-09 17:10:07 +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
|
1bc96f808a
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 14:51:20 +08:00 |
|
gazebo
|
3900e71265
|
- 将人民币符号换成全角，半角飞鹅打印机打不出来
|
2019-04-09 14:46:42 +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 |
|
gazebo
|
af1dbe225c
|
- 因为在UpdateStore是存的valid，所以在调用打印机处理相关的函数后按store更新valid
|
2019-04-09 13:41: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
|
5043a9b1f6
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-09 10:01:46 +08:00 |
|
gazebo
|
358257c70d
|
- 商品如果下架，查询门店商品时，只有关注且可售的才会返回
|
2019-04-09 09:52:29 +08:00 |
|
gazebo
|
fb9ee37ecd
|
- 复制门店商品时，LEFT JOIN写成JOIN了
|
2019-04-09 09:17:53 +08:00 |
|
renyutian
|
657374d8ba
|
t2.delivery_confirm_time 不存在
|
2019-04-08 15:14:54 +08:00 |
|
renyutian
|
1094c325fa
|
美团公益捐款优化
|
2019-04-08 15:07:10 +08:00 |
|
renyutian
|
976a7d0d76
|
结账报错优化
|
2019-04-08 11:27:56 +08:00 |
|
renyutian
|
7d820a6131
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-04 18:08:47 +08:00 |
|
renyutian
|
48ab6f7e75
|
美团尝试
|
2019-04-04 17:58:08 +08:00 |
|
gazebo
|
014ee01dd6
|
- message.content to text
|
2019-04-04 17:09:04 +08:00 |
|
renyutian
|
1745509543
|
Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw
|
2019-04-04 17:03:25 +08:00 |
|
renyutian
|
7a3a914839
|
bug 优化
|
2019-04-04 17:02:48 +08:00 |
|
gazebo
|
a0e1875911
|
Merge branch 'lcw' of git.coding.net:XJH-Rosy/jx-callback into lcw
|
2019-04-04 15:50:33 +08:00 |
|
gazebo
|
bb882a016a
|
Merge branch 'master' into lcw
|
2019-04-04 15:50:15 +08:00 |
|
gazebo
|
edaad0c9b6
|
- SelfDeliveringAndUpdateStatus中不应该依赖DeliveryFlag状态
|
2019-04-04 15:47:50 +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 |
|