renyutian
|
5d998a15b5
|
Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw
|
2019-04-24 14:28:16 +08:00 |
|
renyutian
|
185ebf7d10
|
饿百 部分退款订单漏单，取错字段
|
2019-04-24 13:41:27 +08:00 |
|
gazebo
|
7ac08594b4
|
- 启用京东取货失败，投递失败相关的状态
|
2019-04-24 12:25:06 +08:00 |
|
gazebo
|
b1fcb3c4ae
|
- 只有存在相应的API才注册purchase partner
|
2019-04-24 07:19:44 +08:00 |
|
gazebo
|
a857d40442
|
- InitVendorCategory可对三个主流平台进行操作
|
2019-04-23 17:40:44 +08:00 |
|
gazebo
|
f1e900dbd5
|
+ AcceptOrRefuseFailedGetOrder
+ CallPMCourier
+ ConfirmReceiveGoods
|
2019-04-22 17:59:55 +08:00 |
|
gazebo
|
6cd669085a
|
- fk
|
2019-04-22 14:05:36 +08:00 |
|
gazebo
|
f242b12b4a
|
- fk
|
2019-04-22 12:40:38 +08:00 |
|
gazebo
|
b299b000e5
|
- zhongwu
|
2019-04-22 12:34:44 +08:00 |
|
gazebo
|
09723d966f
|
- fk
|
2019-04-22 11:46:01 +08:00 |
|
gazebo
|
90553e188a
|
- fk
|
2019-04-22 11:20:18 +08:00 |
|
gazebo
|
88908be160
|
- 中午云与易联云打印机添加注册验证
|
2019-04-22 11:00:34 +08:00 |
|
gazebo
|
2438670f61
|
- ebai vendorStatus
|
2019-04-21 19:56:32 +08:00 |
|
gazebo
|
71752cb3e9
|
- mtwm的sku_id可能不能转为数字
|
2019-04-20 13:18:11 +08:00 |
|
gazebo
|
892cbd365a
|
- 新增OrderStatusUndoApplyCancel
|
2019-04-19 17:29:37 +08:00 |
|
gazebo
|
b065c79ec3
|
- 去掉OrderStatusDelivered状态
|
2019-04-19 15:26:13 +08:00 |
|
gazebo
|
9f01129374
|
- 去掉两个没有用的状态OrderStatusFailed，OrderStatusRefund
- 准备将OrderStatusDelivered合并至OrderStatusFinished
|
2019-04-19 15:02:38 +08:00 |
|
gazebo
|
893434e01e
|
- 美团外卖实现调整单及订单申请取消
|
2019-04-19 11:21:09 +08:00 |
|
gazebo
|
e5fbdec9ba
|
- 饿百常量命名修改，支持用户申请取消与调整单
|
2019-04-18 17:39:23 +08:00 |
|
gazebo
|
13261b1e98
|
- remove debug msg
|
2019-04-17 18:27:36 +08:00 |
|
gazebo
|
4baafdbc50
|
- fk
|
2019-04-17 18:11:04 +08:00 |
|
gazebo
|
d0b6d8f87e
|
- 创建饿百商品重复时，用ebaiapi.GetEbaiSkuIDFromError进行判断
|
2019-04-17 17:45:00 +08:00 |
|
gazebo
|
1cc643b42a
|
- 打开错误数据信息运营报警
|
2019-04-17 15:45:21 +08:00 |
|
gazebo
|
bfc3b5f945
|
- 门店价限制不能为负数
- 京东门店价限制为最少一分
|
2019-04-17 15:27:43 +08:00 |
|
gazebo
|
65790a6395
|
- 饿百与美团外卖，全部同步时，删除sku或skuname下架的商品
|
2019-04-17 14:39:54 +08:00 |
|
gazebo
|
ebe0fcb15c
|
- mtwm与ebai在删除门店分类或商品信息时，如果是没有创建的，直接忽略
|
2019-04-17 12:32:55 +08:00 |
|
gazebo
|
ab6e30d630
|
- mtwm.SyncLocalStoreCategory中，如果发现store_sku_category_map有记录，但还没有同步，要计算num
|
2019-04-16 19:39:37 +08:00 |
|
gazebo
|
ba3872327a
|
- mtwm.SyncStoreSkus中SyncStoreCategory必然调用
|
2019-04-16 19:15:20 +08:00 |
|
gazebo
|
be0ab44158
|
- 美团同步商品时添加sequence
|
2019-04-16 17:36:07 +08:00 |
|
gazebo
|
0f871847e9
|
- remove mtwmapi.MsgTypeOrderModified
|
2019-04-16 17:20:40 +08:00 |
|
gazebo
|
8083f2f638
|
! orderman中尽量使用事务
! orderman中全换成dao.DaoDB
|
2019-04-16 16:33:53 +08:00 |
|
gazebo
|
98e873f0b2
|
- AgreeOrRefuseRefund renmae to AgreeOrRefuseCancel
- 修改饿百门店状态判断的错误
|
2019-04-16 09:28:02 +08:00 |
|
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 |
|