苏尹岚
|
78238c806e
|
差评补款
|
2019-12-26 18:49:28 +08:00 |
|
苏尹岚
|
cfb1a2e052
|
差评补款
|
2019-12-26 18:36:58 +08:00 |
|
苏尹岚
|
e95a37789e
|
投诉骑手
|
2019-12-26 17:02:49 +08:00 |
|
苏尹岚
|
2f3514d901
|
投诉骑手
|
2019-12-26 17:00:36 +08:00 |
|
苏尹岚
|
11310fc16d
|
投诉骑手
|
2019-12-26 08:17:14 +08:00 |
|
gazebo
|
6022d24634
|
GetOrderWaybillInfo可选参数：isGetPos支持获取运单骑手实时信息
|
2019-12-25 20:14:53 +08:00 |
|
苏尹岚
|
70e2d05549
|
投诉骑手
|
2019-12-25 18:39:13 +08:00 |
|
苏尹岚
|
3983e9d5a9
|
投诉骑手
|
2019-12-25 18:37:00 +08:00 |
|
gazebo
|
9e40e3942a
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-25 18:25:00 +08:00 |
|
苏尹岚
|
b061bcb18b
|
Accept Merge Request #111: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/111
|
2019-12-25 18:12:33 +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 |
|
苏尹岚
|
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 |
|