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
|
53733320c2
|
报错优化
|
2019-04-04 09:39:21 +08:00 |
|
renyutian
|
632aa6aa3d
|
结账第二期
|
2019-04-03 17:49:30 +08:00 |
|
gazebo
|
2b539fc531
|
- 转发饿百的运单状态给结算流程
|
2019-04-02 16:31:07 +08:00 |
|
gazebo
|
c5d1eb78c5
|
- Interface2FloatWithDefault to Interface2Float64WithDefault
|
2019-04-02 14:33:31 +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
|
8c2e1f4f1b
|
- 美团外卖PoiOnline返回成功也不表示上线成功
|
2019-03-29 15:42:18 +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
|
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
|
b36efa45d3
|
- fk
|
2019-03-26 22:45:03 +08:00 |
|
gazebo
|
8ac4fd77b7
|
- fk
|
2019-03-26 17:00:35 +08:00 |
|
gazebo
|
629247eba1
|
- fk
|
2019-03-26 16:46:04 +08:00 |
|
gazebo
|
d8a3d69f19
|
! 新增饿百假接单消息，将饿百的接单当成拣货完成
|
2019-03-26 16:23:46 +08:00 |
|
gazebo
|
b8d52f3d6f
|
- 在RefreshRealMobile中，当GetRealMobile4Order出错时打印错误消息
|
2019-03-26 10:48:28 +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
|
6cc6ee43bf
|
- 自送订单不调用拣货完成API
- 在updateOrderStoreFeature中将order.DeliveryFlag落地
- 发送用户申请取消订单消息（当前只有饿百与京东有此事件）
|
2019-03-22 17:14:09 +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 |
|
gazebo
|
0f5445020a
|
- ebai部分退款处理消息中的status是int而不是string
|
2019-03-21 20:19:39 +08:00 |
|
renyutian
|
dd040ac664
|
饿百售后订单状态判断优化
|
2019-03-21 18:09:46 +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
|
4876b7664c
|
- 新京东到家订单事件中，顺序调用得到新订单信息与手机号（因为超过了1000个店后，只用订单号查手机号要出错）
- 在defsch中异步调用微信发消息
|
2019-03-20 16:30:48 +08:00 |
|
gazebo
|
02db9f0b4f
|
- implement mtwm.DeleteRemoteStoreSkus
|
2019-03-20 15:31:26 +08:00 |
|
gazebo
|
d0587fef0a
|
- 饿百改了订单中的send_time类型，从string改为int了，FUCK
|
2019-03-19 15:34:07 +08:00 |
|
gazebo
|
e906f0b159
|
- remove useless comment
|
2019-03-19 10:29:09 +08:00 |
|
gazebo
|
f07eeeb9c4
|
- OnOrderDetail
|
2019-03-18 18:14:05 +08:00 |
|
gazebo
|
1e53e4edae
|
- improve jxutils.SplitStoreName
|
2019-03-18 15:04:42 +08:00 |
|
gazebo
|
8346f30b86
|
- financial related msg
|
2019-03-15 16:51:09 +08:00 |
|
gazebo
|
3e7af36e8e
|
- fix bug because the result of GetEleCommentList, shop_id is elm id not ebai id. in ebai.RefreshComment
|
2019-03-15 11:54:02 +08:00 |
|
gazebo
|
39f390cb1f
|
- wrap StartRefreshComment and StartRefreshEbaiRealMobile by ReallyCallPlatformAPI
|
2019-03-15 11:14:33 +08:00 |
|
gazebo
|
bb01fc422b
|
- refactor config ReallyCallPlatformAPI, ReallySendWeixinMsg and ReallyReplyComment
|
2019-03-15 11:09:43 +08:00 |
|
gazebo
|
dec14126a7
|
- replace all goroutine and AfterFunc with recover version
|
2019-03-15 10:26:30 +08:00 |
|