Commit Graph

87 Commits

Author SHA1 Message Date
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
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
renyutian
f28be52906 格式优化 2019-04-04 10:16:35 +08:00
gazebo
2c457a38d5 - 修改美团外卖门店要报错"商家已接入美团配送,不可修改门店配送相关信息",还是只修改门店状态与营业时间 2019-04-03 20:42:02 +08:00
gazebo
2d54c5510e - up 2019-04-03 20:34:43 +08:00
gazebo
886fde0800 - 同步美团外卖门店信息 2019-04-03 20:30:11 +08:00
renyutian
632aa6aa3d 结账第二期 2019-04-03 17:49:30 +08:00
gazebo
53d0e98a66 - 修复ordersku中取门店价错误使用unitPrice的问题
- 同步美团外卖时,将MtwmID设置为京西SKUID
2019-04-02 22:59:02 +08:00
gazebo
1a775d8fd6 - 输出平台订单操作相关的调试信息 2019-03-31 16:07:00 +08:00
gazebo
ef05d85fc2 - 梳理TIMER,去除TimerTypeBaseExpectedDeliveredTime 2019-03-31 15:46:41 +08:00
gazebo
2010560bf9 - up 2019-03-29 16:02:35 +08:00
gazebo
8c2e1f4f1b - 美团外卖PoiOnline返回成功也不表示上线成功 2019-03-29 15:42:18 +08:00
gazebo
14ac83030d - 美团只有在上线状态下营业状态才有意义 2019-03-29 12:50:40 +08:00
gazebo
719579c110 ! 美团外卖与饿百门店只更新营业相关的状态 2019-03-29 12:13:36 +08:00
gazebo
e17afbd4b9 - 门店同步状态区分名称与配送相关的部分,分开同步 2019-03-29 11:39:07 +08:00
gazebo
4897c87bc1 - 梳理真实手机号相关的流程,ConsigneeMobile为真实手机号时ConsigneeMobile2也有值(之前不是这样的) 2019-03-28 15:56:50 +08:00
gazebo
24af4bc330 - 重构RefreshOrderRealMobile 2019-03-28 15:09:23 +08:00
gazebo
cd99fc3e14 - 对于饿百与美团外卖订单,设置其PickDeadline 2019-03-28 14:08:44 +08:00
gazebo
964b86b642 - 判断同步标志时,如果既有新建也有删除标志,则空操作 2019-03-28 11:14:44 +08:00
gazebo
1996143de6 - Store.OriginalName 2019-03-27 17:28:22 +08:00
gazebo
ceef564354 - fk 2019-03-27 16:21:06 +08:00
gazebo
9a89c596d4 - 处理自配送门店非立即达订单的发运单时间问题 2019-03-27 14:32:08 +08:00
gazebo
3380d6081a - SelfDeliverDelievered to SelfDeliverDelivered 2019-03-27 11:41:02 +08:00
gazebo
87ea9ff15a - 完成美团外卖运单调度
- 整理虚拟消息
2019-03-27 11:39:24 +08:00
gazebo
04c82289fd - 饿百与美团添加拣货完成后延迟召唤三方配送 2019-03-27 09:52:48 +08:00
gazebo
698e2bde5d - 修复mtwp.PickupGoods中没有正确返回错误的BUG 2019-03-26 09:48:50 +08:00
gazebo
51925245a0 - 美团外卖订单,不设置StoreID为app_poi_code(因为现在是把app_poi_code当成VendorStoreID) 2019-03-25 23:03:48 +08:00
gazebo
c173caaf6f - 设置美团外卖的自动拣货时间为4分钟 2019-03-25 12:04:46 +08:00
gazebo
837395f431 - 自配送门店的PickupGoods不应调用平台相应API,模拟一个事件 2019-03-22 20:55:59 +08:00
gazebo
25ac631c5c - refactor jxcontent and tasksch (remove dependency from jxcontent to tasksch)
- send dingding msg to user when async task finished
2019-03-22 15:04:28 +08:00
renyutian
cbee85acce 京东正向订单结账信息记录优化 2019-03-21 17:23:50 +08:00
renyutian
9fc122d7f0 Merge remote-tracking branch 'origin/jxstore' into lcw 2019-03-21 16:48:27 +08:00
gazebo
81efff6380 - OnOrderDetail 2019-03-21 16:46:52 +08:00
renyutian
0ee04cdd4d - 结算初始版本 2019-03-21 16:12:54 +08:00
gazebo
c2497b089f - refactor GetOrder 2019-03-21 11:09:58 +08:00
gazebo
15c703b469 - refactor test init flow 2019-03-20 22:28:51 +08:00
gazebo
120e0dde6c - 将微商场当成一个单一商场,不再根据lbs来派单 2019-03-20 22:02:30 +08:00
gazebo
02db9f0b4f - implement mtwm.DeleteRemoteStoreSkus 2019-03-20 15:31:26 +08:00
gazebo
d158b0fc02 - up 2019-03-19 10:29:27 +08:00
gazebo
f07eeeb9c4 - OnOrderDetail 2019-03-18 18:14:05 +08:00
gazebo
69cf6d54ff - fix mtwm price to normal price. 2019-03-18 16:06:38 +08:00
gazebo
1e53e4edae - improve jxutils.SplitStoreName 2019-03-18 15:04:42 +08:00
gazebo
a4d8fd6230 - set mtwm sku weight when tag_id specified in SyncStoreSkus 2019-03-18 10:51:15 +08:00
gazebo
2434f77b8b - don't set default mtwm vendor cat id 2019-03-17 22:25:28 +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
071ae8c5d8 - try mtwm app_poi_code as platform id(not jx id). 2019-03-16 20:32:00 +08:00