Commit Graph

240 Commits

Author SHA1 Message Date
苏尹岚
fe782dabaf 给客户和配送员发短信 2020-05-19 14:58:01 +08:00
苏尹岚
d9c4889ba2 召唤三方配送的运费上限增加2块 2020-04-21 17:30:45 +08:00
苏尹岚
b81dd56de4 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-04-02 17:08:17 +08:00
苏尹岚
5aac773a06 订单利润报警增加订单序号 2020-04-02 17:08:00 +08:00
苏尹岚
a5c3a1c985 订单第二次取货失败尝试清除orderflag 2020-04-02 13:32:40 +08:00
苏尹岚
b6126857cc 订单新增earningprice2 2020-03-19 16:34:30 +08:00
suyl
e50b127816 新订单短信提醒fakeprice乘除 2020-02-24 20:49:59 +08:00
苏尹岚
34c8dc31c5 美团饿百负责人搞反了 2020-02-18 14:18:33 +08:00
gazebo
97a5c2d921 添加Store.OperatorPhone3 2020-02-12 08:40:18 +08:00
gazebo
f73a97fc6b courierstore status 2020-02-09 12:03:04 +08:00
gazebo
70a3f59026 京西商城自动配送调度只使用达达 2020-02-07 10:17:57 +08:00
gazebo
c2519be865 自配送门店也要检查isDeliveryCompetition 2020-02-01 12:09:54 +08:00
gazebo
80dc8a89c8 调试Waybill的ID为0的情况 2020-01-19 15:09:32 +08:00
gazebo
a27f261ca4 饿百平台运单取消后给运营发报警消息 2020-01-17 14:25:11 +08:00
苏尹岚
ecb1b12525 订单预警利润公式修改 2020-01-17 08:38:44 +08:00
gazebo
8b3977b10f 基础运费尽量用订单的,没有才用缺省值 2020-01-15 16:50:03 +08:00
gazebo
510b9e8483 修复处理投递失败的BUG 2020-01-08 11:38:46 +08:00
gazebo
381d1b2f21 调整加订单配送小费逻辑,添加美团外卖平台支持 2019-12-26 16:19:04 +08:00
gazebo
deadc8f563 UpdateOrderWaybillTip 2019-12-26 14:18:16 +08:00
gazebo
9e40e3942a Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-25 18:25:00 +08:00
苏尹岚
99c20d3712 订单预警 2019-12-25 18:11:45 +08:00
苏尹岚
a8e3d512d2 Accept Merge Request #110: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/110
2019-12-25 15:35:38 +08:00
苏尹岚
11149487b5 订单预警 2019-12-25 15:34:55 +08:00
gazebo
880d2aedc0 配送相关接口调整 2019-12-25 15:32:58 +08:00
苏尹岚
d86a0e1b26 Accept Merge Request #101: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/101
2019-12-23 18:12:48 +08:00
苏尹岚
a1bdf6cde3 订单预警 2019-12-23 18:12:03 +08:00
苏尹岚
758e0f23f2 订单预警 2019-12-23 17:50:11 +08:00
gazebo
65c09d395b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-23 17:27:38 +08:00
gazebo
54aeef6b4a fk 2019-12-23 17:27:30 +08:00
苏尹岚
1e640ad6f4 订单预警 2019-12-23 17:01:58 +08:00
gazebo
0b35c7a932 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-23 14:46:18 +08:00
gazebo
c6a99d73f8 up 2019-12-23 14:46:07 +08:00
苏尹岚
3f98af6a11 订单利润预警 2019-12-23 10:45:12 +08:00
苏尹岚
ddb129dbc0 订单预警 2019-12-23 10:32:40 +08:00
苏尹岚
846442f478 订单利润报警 2019-12-23 10:29:35 +08:00
gazebo
41f0d1fa3d up 2019-12-20 11:44:09 +08:00
gazebo
53bd1ecb43 fk 2019-12-20 11:33:17 +08:00
gazebo
48b6de0a6f +setFakeActualPayPrice 2019-12-20 11:20:02 +08:00
gazebo
9498542e59 修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误
2019-12-19 12:07:15 +08:00
gazebo
ecedbe9be4 京东api区分vendorOrgCode 2019-12-09 15:16:21 +08:00
gazebo
d93356ad01 饿百在发送运单取消事件后,如果订单没有及时(具体时间未知)转出自送,则订单会被取消,且不会发送订单取消事件 2019-11-29 16:28:21 +08:00
gazebo
45827aceb5 +CanSwitch2SelfDeliver,美团预定单是不能转自送的
减小转自送失败尝试时间间隙至3秒(以免出现不能取消三方运单的情况)
2019-11-28 14:18:52 +08:00
gazebo
af7ba61bbc bug fix 2019-11-26 11:47:33 +08:00
gazebo
72d6b3c733 自配送门店订单的三方配送限价直接为10元 2019-11-25 18:13:42 +08:00
gazebo
622bfc89df !!!重新实现订单调度timer,可以允许多个timer. 2019-11-25 15:49:38 +08:00
gazebo
42e348e59a 准备重构订单调度定时器 2019-11-23 15:36:17 +08:00
gazebo
61eb7d0546 ShouldSetTimer结构优化 2019-11-22 14:37:21 +08:00
gazebo
9dda86169b 美团订单完全忽略运单定时器 2019-11-21 17:42:24 +08:00
gazebo
2f117ec0d3 isStatusNewer中,美团订单在接单后就会收到新运单事件,因当前只支持一个TIMER,暂时舍弃三方配送调度,而要自动拣货调度 2019-11-12 18:27:38 +08:00
gazebo
7ab34ae366 OnWaybillStatusChanged中收到运单接单事件,强制设置订单状态时,要判断订单是否已经结束了 2019-11-07 18:37:49 +08:00