renyutian
|
a12d6f04f1
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-28 15:36:24 +08:00 |
|
gazebo
|
973b6c6869
|
- 忽略在jd storeCrud消息时找不到门店的错误
|
2019-04-25 21:35:33 +08:00 |
|
gazebo
|
207d8e2bf2
|
- 创建京东商品时忽略已经存在错误
|
2019-04-25 08:42:35 +08:00 |
|
gazebo
|
a09437bf3d
|
- 京西果园的缺省类别为22410（其他国产水果）
|
2019-04-24 15:56:32 +08:00 |
|
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
|
9f01129374
|
- 去掉两个没有用的状态OrderStatusFailed，OrderStatusRefund
- 准备将OrderStatusDelivered合并至OrderStatusFinished
|
2019-04-19 15:02:38 +08:00 |
|
gazebo
|
893434e01e
|
- 美团外卖实现调整单及订单申请取消
|
2019-04-19 11:21:09 +08:00 |
|
gazebo
|
bfc3b5f945
|
- 门店价限制不能为负数
- 京东门店价限制为最少一分
|
2019-04-17 15:27:43 +08:00 |
|
gazebo
|
0f871847e9
|
- remove mtwmapi.MsgTypeOrderModified
|
2019-04-16 17:20:40 +08:00 |
|
gazebo
|
98e873f0b2
|
- AgreeOrRefuseRefund renmae to AgreeOrRefuseCancel
- 修改饿百门店状态判断的错误
|
2019-04-16 09:28:02 +08:00 |
|
gazebo
|
caabbb4a66
|
- IPurchasePlatformHandler中添加
AgreeOrRefuseRefund
CancelOrder
AdjustOrder
|
2019-04-13 18:35:58 +08:00 |
|
renyutian
|
211a9928e0
|
结账信息收到重复订单推送处理
|
2019-04-12 16:30:59 +08:00 |
|
gazebo
|
77c5a16c08
|
- 接收门店状态消息，本地同步状态，京东暂时无效
|
2019-04-12 16:22:22 +08:00 |
|
gazebo
|
5f9b2a08bb
|
- 重构UploadImg
|
2019-04-11 16:19:28 +08:00 |
|
renyutian
|
976a7d0d76
|
结账报错优化
|
2019-04-08 11:27:56 +08:00 |
|
renyutian
|
f28be52906
|
格式优化
|
2019-04-04 10:16:35 +08:00 |
|
renyutian
|
53733320c2
|
报错优化
|
2019-04-04 09:39:21 +08:00 |
|
renyutian
|
632aa6aa3d
|
结账第二期
|
2019-04-03 17:49:30 +08:00 |
|
gazebo
|
1a775d8fd6
|
- 输出平台订单操作相关的调试信息
|
2019-03-31 16:07:00 +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
|
1996143de6
|
- Store.OriginalName
|
2019-03-27 17:28:22 +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
|
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
|
fad5f02c22
|
京东售后订单时间优化
|
2019-03-21 17:44:43 +08:00 |
|
renyutian
|
cbee85acce
|
京东正向订单结账信息记录优化
|
2019-03-21 17:23:50 +08:00 |
|
renyutian
|
54b8bc8715
|
Merge remote-tracking branch 'origin/jxstore' into lcw
|
2019-03-21 16:52:21 +08:00 |
|
gazebo
|
c7a1dc650d
|
- fk
|
2019-03-21 16:50:49 +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
|
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
|
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
|
b000fbb3e7
|
- AfterSaleBillStatus
|
2019-03-15 15:04:25 +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 |
|
gazebo
|
fffb7a495b
|
- enable new order comment
|
2019-03-14 12:07:59 +08:00 |
|
gazebo
|
9423f2efea
|
- fk
|
2019-03-13 11:04:55 +08:00 |
|
gazebo
|
786239a897
|
- optimize SyncStoreSkus, isContinueWhenError will really continue
|
2019-03-13 10:54:47 +08:00 |
|
gazebo
|
aeddf01cbd
|
- fk
|
2019-03-12 21:11:18 +08:00 |
|