Commit Graph

52 Commits

Author SHA1 Message Date
苏尹岚
5a65f04e15 dada门店名 2020-08-12 12:02:54 +08:00
苏尹岚
c8d921a74f 发到哪不在门店营业时间修改 2020-07-28 14:22:45 +08:00
苏尹岚
115a961d07 订单不在营业时间范围内修改 2020-07-28 09:06:14 +08:00
苏尹岚
f97ae49945 门店发单修改 2020-07-24 18:15:02 +08:00
gazebo
6022d24634 GetOrderWaybillInfo可选参数:isGetPos支持获取运单骑手实时信息 2019-12-25 20:14:53 +08:00
gazebo
c28247e6b7 +GoodsOrder.BaseFreightMoney 2019-12-23 15:35:34 +08:00
gazebo
42e348e59a 准备重构订单调度定时器 2019-11-23 15:36:17 +08:00
gazebo
208e836f40 整理订单调整中对于DeliveryType相关的流程 2019-11-06 14:29:13 +08:00
gazebo
d913825268 fk 2019-10-25 18:50:01 +08:00
gazebo
d4f36e0615 修复isPossibleSwitch2SelfDelivery中的bug 2019-10-25 18:32:40 +08:00
gazebo
7ca6e2970f 只在待拣货状态,才判断转三方是否满足最低时间要求isPossibleSwitch2SelfDelivery 2019-10-24 09:42:22 +08:00
gazebo
470f54f705 添加API SyncStoresCourierInfo 2019-10-11 16:12:09 +08:00
gazebo
78930d9c1a 三方运单计价各管各,不在以美团为基准,创建运单只有一个限制条件,最高运费:maxDeliveryFee
优化美团运费计算,两点距离用高德API实际计算行走距离
2019-09-26 15:47:18 +08:00
gazebo
9ea9e484a7 - 不用GROUP BY重新实现GetStores 2019-09-23 16:47:10 +08:00
gazebo
f3d496ec60 - 查询订单运费与发三方运单时,自提单报错 2019-09-05 18:44:08 +08:00
gazebo
dab32bbe0e - SelfDeliveringAndUpdateStatus中添加订单日志 2019-08-06 10:22:05 +08:00
gazebo
758f44b439 - CreateWaybillOnProviders4SavedOrder及CreateWaybillOnProviders添加excludeCourierVendorIDs参数 2019-07-31 20:08:20 +08:00
gazebo
c7bf2df5a5 - rename partner.CreateWaybillPolicy to CreateWaybillPolicyFunc 2019-07-30 16:53:13 +08:00
gazebo
35560d0daa - fk 2019-06-25 17:27:24 +08:00
gazebo
64e45962bf - 手工创建三方运单记录消息 2019-06-25 13:26:41 +08:00
gazebo
49cff7648c - 之前一些对于OrderStatusFinishedPickup的判断,由于加入了OrderStatusApplyFailedGetGoods后,一些相关的判断调整 2019-06-16 12:30:04 +08:00
gazebo
7ffad7e217 - isPossibleSwitch2SelfDelivery中,订单结束后不能转自送 2019-05-30 11:20:30 +08:00
gazebo
bcd648b153 - UpdateOrderStatusAndFlag to UpdateOrderStatusAndDeliveryFlag 2019-05-27 14:43:13 +08:00
gazebo
4586ede2dc - 优化DefScheduler.updateOrderByBill,避免设置bill的WaybillVendorID和VendorWaybillID 2019-05-15 23:10:47 +08:00
gazebo
2a1fdba715 - 修复转自配送后收到运单接受消息处理错误问题 2019-05-10 10:36:30 +08:00
gazebo
9f6c978e49 - isPossibleSwitch2SelfDelivery 2019-05-10 10:23:18 +08:00
gazebo
5f7a1ed431 - fix bug 4 QueryOrderWaybillFeeInfoEx 2019-05-08 17:17:45 +08:00
gazebo
ea75a0ad7b - 调整QueryOrderWaybillFeeInfo 2019-05-07 12:01:07 +08:00
gazebo
5628c23741 - CreateWaybillOnProviders添加maxAddFee与maxDiffFee2Mtps参数 2019-04-29 15:56:12 +08:00
gazebo
b0e0d2b591 - 强发运单只创建一个 2019-04-29 14:07:38 +08:00
gazebo
07f6b9d340 - 调用SelfDeliverDelivering要传骑手或店主手机号 2019-04-09 17:10:07 +08:00
gazebo
edaad0c9b6 - SelfDeliveringAndUpdateStatus中不应该依赖DeliveryFlag状态 2019-04-04 15:47:50 +08:00
gazebo
77aa71577f - 主运单取消时设置订单TIMER,只有在配送中状态的订单才会马上新建运单
- 非自配送门店转3方配送至少要求拣货完成后5分钟才能操作
2019-04-02 18:45:01 +08:00
gazebo
8ff383410b - 重构canOrderCreateWaybillNormally 2019-03-30 18:21:19 +08:00
gazebo
b9915b1116 - CreateWaybillOnProvider4SavedOrder to CreateWaybillOnProviders4SavedOrder 2019-03-30 17:14:34 +08:00
gazebo
96fb2d9535 - 重构createWaybillOn3rdProviders 2019-03-30 17:11:23 +08:00
gazebo
10a444c895 - 重构创建运单策略 2019-03-30 15:00:59 +08:00
gazebo
8f17ec1675 - 强制召唤忽略价格 2019-03-30 10:59:06 +08:00
gazebo
51f736976d - CancelAll3rdWaybills添加isStopSchedule参数 2019-03-26 14:17:23 +08:00
gazebo
6406e26d15 - 将几个loadSavedOrderFromMap的isAutoLoad设置为true 2019-03-26 09:51:12 +08:00
gazebo
b5135287af - 手动创建运单时要判断订单是否已经有了有效的运单 2019-03-23 21:01:03 +08:00
gazebo
34c25a7639 - add API CancelAll3rdWaybills
- sync all order related APIs
2019-02-21 18:19:12 +08:00
gazebo
2a458d8c93 - fix bug in CreateWaybillOnProvidersEx(OrderDeliveryFlagMaskScheduleDisabled) 2019-02-18 18:28:44 +08:00
gazebo
f79c4b098d - change error description in CreateWaybillOnProvidersEx 2019-02-14 15:34:32 +08:00
gazebo
ddbedfc680 - don't set OrderDeliveryFlagMaskPurcahseDisabled in DefScheduler.CreateWaybillOnProvidersEx 2019-02-14 14:40:29 +08:00
gazebo
64d605d6e9 - fix bug in CreateWaybillOnProvidersEx and SelfDeliveringAndUpdateStatus 2019-02-14 12:30:36 +08:00
gazebo
7c80ca2352 - debug in CreateWaybillOnProvidersEx 2019-02-14 12:17:59 +08:00
gazebo
e9deb4ef6b - autoload order in DefScheduler.CreateWaybillOnProvidersEx 2019-02-14 12:07:20 +08:00
gazebo
446dc061fa - add param forceCreate for CreateWaybillOnProviders
- fix error msg bug in BaseScheduler.CreateWaybillOnProviders
2019-02-14 10:53:45 +08:00
gazebo
b51ceb3d1d - add jxcontext.Context to all public API. 2018-10-21 22:41:11 +08:00