gazebo
|
e33ab1d62a
|
- add shop_close in ebai.onShopMsgPush
|
2019-04-14 12:43:38 +08:00 |
|
gazebo
|
06c54755b0
|
- up
|
2019-04-14 12:38:11 +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 |
|
gazebo
|
0055892cb2
|
- 修复financial中的事务问题，某些情况上return nil需要回滚
|
2019-04-13 11:08:24 +08:00 |
|
gazebo
|
a12889d133
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-04-13 09:34:17 +08:00 |
|
gazebo
|
53cc491a04
|
- order_Financial to order_financial
|
2019-04-13 09:33:46 +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 |
|
gazebo
|
cc627da2a4
|
- 修复FormalizeStoreStatus中的死锁问题
|
2019-04-12 17:26:28 +08:00 |
|
gazebo
|
47ec846c36
|
- dao.FormalizeStoreStatus
|
2019-04-12 17:10:35 +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
|
e2f728889b
|
- dao.GetStoreSkus 与 dao.GetFullStoreSkus 智能取sku name的img
|
2019-04-11 17:06:46 +08:00 |
|
gazebo
|
1c77d18e23
|
- 由于微盟微商城TOKEN的原因，在ALPHA禁用
|
2019-04-11 16:27:24 +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
|
911c6d83ce
|
- 只在prod时做手机号与差评刷新
|
2019-04-11 14:54:01 +08:00 |
|
gazebo
|
53fa68d3ba
|
- 饿百图片库管理
|
2019-04-11 14:39:45 +08:00 |
|
gazebo
|
6e3b9a8215
|
- 将微信的备注改为店名相关的信息
|
2019-04-11 11:59:04 +08:00 |
|
gazebo
|
ff52db6dd7
|
- 对于外卖管家打印机ESCAPE *
|
2019-04-11 09:58:54 +08:00 |
|
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 |
|