gazebo
|
4b5fd5925d
|
- 禁用达达发单
|
2019-05-06 17:07:40 +08:00 |
|
gazebo
|
afd391f25f
|
- 由于达达有时会漏发接单消息，将配送中消息也当成接单消息处理
|
2019-05-06 16:45:23 +08:00 |
|
gazebo
|
845fc89180
|
- 美团外卖v500打印机适配
|
2019-05-06 16:19:36 +08:00 |
|
gazebo
|
244baf165c
|
- debug msg
|
2019-05-06 09:41:25 +08:00 |
|
gazebo
|
992bab7d31
|
- mtwmCallbackURL = "http://callback.alpha.jxc4.com" for alpha
|
2019-05-06 09:24:14 +08:00 |
|
gazebo
|
e3548d90ea
|
- env为alpha时也刷新微信token
|
2019-05-05 17:04:58 +08:00 |
|
gazebo
|
07dac82577
|
- alpha微信KEY
|
2019-05-05 17:01:58 +08:00 |
|
gazebo
|
fbcc8e44e1
|
- - alpha饿百KEY设置为果园的测试门店
|
2019-05-05 15:51:09 +08:00 |
|
gazebo
|
a3efea76a4
|
- alpha饿百KEY设置为一个不用的账号的测试账号
|
2019-05-05 12:09:41 +08:00 |
|
gazebo
|
3928d345b0
|
- 美团外卖运单压单状态映射
|
2019-05-05 11:12:52 +08:00 |
|
gazebo
|
2a102ea821
|
- 设置正确的京西果园COOKIE
|
2019-05-01 23:04:08 +08:00 |
|
gazebo
|
3be7e0f136
|
- 美团外卖调整单时，先要确认订单
|
2019-05-01 17:17:19 +08:00 |
|
gazebo
|
8ee100c3cc
|
! 饿百转自送的时机不太清楚，暂时禁用超时转自送，在饿百运单取消时还是会自动创建
|
2019-05-01 13:42:21 +08:00 |
|
gazebo
|
26355a6f95
|
- 修复没有正确累加savedOrderInfo.retryCount的BUG
|
2019-05-01 13:40:26 +08:00 |
|
gazebo
|
c43750f2f4
|
+ RemoveSkuFromOrder
+ 美团配送调整消息正确更新订单信息
|
2019-05-01 13:38:41 +08:00 |
|
gazebo
|
3591e00636
|
- 当收到三方运单的接单消息时，只有自配送门店才会马上发信息消息，非自配送门店要到转自送成功后才发
- 收到运单取消后重建的条件从order.Status >= model.OrderStatusDelivering改为order.Status >= model.OrderStatusFinishedPickup
|
2019-05-01 10:57:54 +08:00 |
|
gazebo
|
fa97e0b038
|
- 修复饿百调整单消息没有正确更新订单信息的BUG
|
2019-05-01 10:13:45 +08:00 |
|
gazebo
|
877109aee0
|
- QueryOrderWaybillFeeInfo
|
2019-04-30 15:41:51 +08:00 |
|
gazebo
|
7389787b6a
|
- fk
|
2019-04-30 14:23:28 +08:00 |
|
gazebo
|
2a83da4baf
|
- updateStoreSkusSaleWithoutSync中只把状态或上SyncFlagSaleMask
|
2019-04-30 12:21:03 +08:00 |
|
gazebo
|
16ab710302
|
- 同步饿百门店营业时间
|
2019-04-30 11:34:54 +08:00 |
|
gazebo
|
f2cdbf7e8c
|
- enable enableJdStoreWrite on alpha
|
2019-04-30 11:21:25 +08:00 |
|
gazebo
|
55a9a12727
|
! 门店商品同步标志分为price, sale和基础信息modify`
|
2019-04-30 11:12:45 +08:00 |
|
gazebo
|
2226df4e0a
|
- 转自送失败时写日志
|
2019-04-29 18:27:11 +08:00 |
|
gazebo
|
16d738cca1
|
- 饿百订单的调整单特殊处理，因为必须要确认订单后能才调整
|
2019-04-29 17:35:36 +08:00 |
|
gazebo
|
7de70c63ea
|
- 只有4个异常状态发消息
|
2019-04-29 17:10:11 +08:00 |
|
gazebo
|
0c2751700a
|
- 饿百的用户取消申请处理
|
2019-04-29 16:45:31 +08:00 |
|
gazebo
|
1bb6e38202
|
- 处理京东orderShareRatioData
|
2019-04-29 15:57:09 +08:00 |
|
gazebo
|
5628c23741
|
- CreateWaybillOnProviders添加maxAddFee与maxDiffFee2Mtps参数
|
2019-04-29 15:56:12 +08:00 |
|
gazebo
|
d8f1c33b93
|
- 修复发送订单消息的BUG
|
2019-04-29 14:44:34 +08:00 |
|
gazebo
|
b0e0d2b591
|
- 强发运单只创建一个
|
2019-04-29 14:07:38 +08:00 |
|
gazebo
|
6c1e4b99c7
|
- WaybillStatusName
|
2019-04-29 12:07:30 +08:00 |
|
gazebo
|
0124cf4bcd
|
- 如果不同意用户取消订单成功后，把上解锁订单
|
2019-04-29 11:52:45 +08:00 |
|
gazebo
|
efdc78da59
|
- beta饿百配置为测试门店
|
2019-04-29 10:55:33 +08:00 |
|
gazebo
|
a6ac95c181
|
- only enable EnableEbaiStoreWrite
|
2019-04-29 10:41:28 +08:00 |
|
gazebo
|
c462510b2d
|
- add conf enableJdStoreWrite
- enable enableEbaiStoreWrite on beta
|
2019-04-29 10:35:45 +08:00 |
|
gazebo
|
f403a74bc0
|
- ebai.financial中，获取order_id全用GetOrderIDFromMsg或GetOrderIDFromMap
|
2019-04-28 17:40:49 +08:00 |
|
gazebo
|
7fa0911495
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-04-28 17:28:09 +08:00 |
|
gazebo
|
5ee6bf0b80
|
- make GoodsOrder.LockStatusTime visible
|
2019-04-28 17:27:34 +08:00 |
|
LCW-Rosy
|
dce82ed4a1
|
Accept Merge Request #18: (lcw -> mark)
Merge Request: 优化
Created By: @LCW-Rosy
Accepted By: @LCW-Rosy
URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/18
|
2019-04-28 16:37:22 +08:00 |
|
renyutian
|
54854f05b5
|
down_flag
|
2019-04-28 16:35:14 +08:00 |
|
renyutian
|
9000937294
|
降级号处理
|
2019-04-28 16:04:27 +08:00 |
|
renyutian
|
a12d6f04f1
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-28 15:36:24 +08:00 |
|
gazebo
|
7bdcf5bb95
|
- 在重复LockStatus时报警
|
2019-04-28 14:37:18 +08:00 |
|
gazebo
|
1df08e9360
|
- 平台取消申请审核时限参数
- 一些订单操作标记
- LockStatusTime
|
2019-04-28 12:14:24 +08:00 |
|
gazebo
|
857451feb2
|
- auth.GetWeiXinUserInfo添加调试
|
2019-04-28 10:14:42 +08:00 |
|
gazebo
|
25cd0463fe
|
- up
|
2019-04-27 19:00:17 +08:00 |
|
gazebo
|
554b0351a6
|
- up
|
2019-04-27 18:50:26 +08:00 |
|
gazebo
|
8249f1727f
|
- up
|
2019-04-27 18:39:00 +08:00 |
|
gazebo
|
f48ff514d8
|
- up
|
2019-04-27 18:31:53 +08:00 |
|