苏尹岚
|
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 |
|
苏尹岚
|
2ee7c74e2a
|
投诉骑手
|
2019-12-23 15:41:43 +08:00 |
|
苏尹岚
|
943c4a723d
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-23 15:38:01 +08:00 |
|
gazebo
|
c28247e6b7
|
+GoodsOrder.BaseFreightMoney
|
2019-12-23 15:35:34 +08:00 |
|
苏尹岚
|
a8439f38e1
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-23 15:29:27 +08:00 |
|
苏尹岚
|
166f5320d3
|
投诉骑手
|
2019-12-23 15:27:06 +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 |
|
苏尹岚
|
480132cafe
|
组合名字函数修改
|
2019-12-20 15:59:42 +08:00 |
|
苏尹岚
|
0a8a0faec4
|
exprefix索引，order修改
|
2019-12-20 14:32:14 +08:00 |
|
苏尹岚
|
d6d4ab23bb
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-20 11:23:16 +08:00 |
|
gazebo
|
48b6de0a6f
|
+setFakeActualPayPrice
|
2019-12-20 11:20:02 +08:00 |
|
苏尹岚
|
dad7a5a926
|
获取某个商品平台价，商品名前缀
|
2019-12-19 18:40:46 +08:00 |
|
苏尹岚
|
a3c236d281
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-19 15:24:31 +08:00 |
|
gazebo
|
84985a73fb
|
调整单的调试信息
|
2019-12-19 14:10:45 +08:00 |
|
gazebo
|
9498542e59
|
修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成，则忽略错误
|
2019-12-19 12:07:15 +08:00 |
|
苏尹岚
|
990f3a2da2
|
pr修改
|
2019-12-18 15:19:22 +08:00 |
|
苏尹岚
|
2403c51764
|
修改不正常订单状态
|
2019-12-18 10:29:09 +08:00 |
|
苏尹岚
|
8cd09089a8
|
组合名字函数修改
|
2019-12-18 10:06:14 +08:00 |
|
gazebo
|
d5f2273d79
|
+dao.LoadPendingOrders
|
2019-12-17 14:00:01 +08:00 |
|
gazebo
|
16b772f13c
|
Merge branch 'master' into mark
|
2019-12-17 10:07:13 +08:00 |
|
gazebo
|
9e1ec73200
|
去除realEarningPrice
|
2019-12-17 09:35:28 +08:00 |
|
gazebo
|
7296b5cca3
|
GetEffectiveActStoreSkuInfo, ActTypeAll
|
2019-12-16 16:46:05 +08:00 |
|
gazebo
|
84f2c8930c
|
GetEffectiveActStoreSkuInfo添加actType参数
修复ActStoreSkuParam2Model中调用GetEffectiveActStoreSkuInfo的bug
|
2019-12-16 16:39:39 +08:00 |
|
gazebo
|
4772caf080
|
Store添加AutoReplyType，用于标识（订单）自动回复类型
|
2019-12-16 16:17:02 +08:00 |
|
苏尹岚
|
4bf7105cab
|
刷新历史订单结算价修改
|
2019-12-12 17:32:55 +08:00 |
|
gazebo
|
e918d834ec
|
RefreshHistoryOrdersEarningPrice中不正确返回retVal给ParallelTask的问题修复
|
2019-12-12 16:16:02 +08:00 |
|
苏尹岚
|
19704b74bc
|
错误提示，门店评分修改
|
2019-12-12 13:38:06 +08:00 |
|
gazebo
|
7ef2f0c23d
|
1000007223的配送管理问题。暂时先把SelfDeliverDelivered的状态限制放开
|
2019-12-11 08:49:15 +08:00 |
|
gazebo
|
9cf63d1e80
|
fk
|
2019-12-10 14:58:40 +08:00 |
|
gazebo
|
d2168afd15
|
修复ConfirmSelfTakeOrders的bug
|
2019-12-10 14:48:39 +08:00 |
|
gazebo
|
8b33ec5f5a
|
修复上次提交处理平台vendorOrgCode的bug
|
2019-12-09 15:45:09 +08:00 |
|
gazebo
|
ecedbe9be4
|
京东api区分vendorOrgCode
|
2019-12-09 15:16:21 +08:00 |
|
gazebo
|
769a66a08a
|
自动完成内部自提单
|
2019-12-08 17:49:26 +08:00 |
|
gazebo
|
38046bbe24
|
尽量减少对于api.JdAPI的直接依赖
|
2019-12-03 11:21:54 +08:00 |
|
gazebo
|
30e918c5e2
|
删除历史无用的代码
|
2019-12-03 09:15:58 +08:00 |
|
苏尹岚
|
3c5afc31b6
|
接口位置移动，门店归属补漏修改，获取京东用户修改
|
2019-12-02 11:12:09 +08:00 |
|
gazebo
|
6d1129a61c
|
up
|
2019-11-29 17:19:24 +08:00 |
|
gazebo
|
d93356ad01
|
饿百在发送运单取消事件后，如果订单没有及时（具体时间未知）转出自送，则订单会被取消，且不会发送订单取消事件
|
2019-11-29 16:28:21 +08:00 |
|
gazebo
|
a4cdd45487
|
up
|
2019-11-29 12:07:33 +08:00 |
|
gazebo
|
ab493a59fb
|
+GetMyOrders
|
2019-11-29 10:35:38 +08:00 |
|
gazebo
|
1bda4d6058
|
+OrderManager.CreateAfsOrderFromOrder
|
2019-11-28 18:54:52 +08:00 |
|