苏尹岚
|
33f2e2b74d
|
差评扣款
|
2020-01-07 08:26:13 +08:00 |
|
苏尹岚
|
103bce68ba
|
差评补款
|
2020-01-06 18:25:14 +08:00 |
|
苏尹岚
|
f869a8e065
|
差评退款
|
2020-01-06 15:42:47 +08:00 |
|
苏尹岚
|
b8bdea90f3
|
冲突处理
|
2020-01-06 08:54:48 +08:00 |
|
gazebo
|
e89af0849e
|
CaculateSkuEarningPrice中调用ConstrainPayPercentage
+RefreshOrdersPriceInfo
|
2020-01-03 15:56:02 +08:00 |
|
gazebo
|
8cfbf4fcf9
|
warning当GetStoreSkuPriceAndWeight返回错误时在updateOrderSkuOtherInfo与updateAfsOrderSkuOtherInfo中
|
2020-01-03 10:56:43 +08:00 |
|
苏尹岚
|
c616808290
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-03 10:54:36 +08:00 |
|
gazebo
|
9c5f5956e1
|
用GetStoreSkuPriceAndWeight替换之前订单中更新订单商品信息逻辑
|
2020-01-03 10:36:54 +08:00 |
|
苏尹岚
|
0f2058de84
|
自动关注
|
2019-12-31 13:31:29 +08:00 |
|
苏尹岚
|
e82d9851de
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-30 15:11:29 +08:00 |
|
gazebo
|
f5f3aef933
|
GetOrderWaybillInfo中当isGetPos为true时，暂时忽略状态检查
|
2019-12-30 09:42:14 +08:00 |
|
苏尹岚
|
0b9240d8e0
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-30 08:25:09 +08:00 |
|
苏尹岚
|
6467def8b4
|
差评补款
|
2019-12-30 08:25:01 +08:00 |
|
苏尹岚
|
b068d07c33
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-27 17:52:23 +08:00 |
|
苏尹岚
|
78238c806e
|
差评补款
|
2019-12-26 18:49:28 +08:00 |
|
苏尹岚
|
cfb1a2e052
|
差评补款
|
2019-12-26 18:36:58 +08:00 |
|
gazebo
|
4aa2984048
|
comment
|
2019-12-26 17:43:17 +08:00 |
|
gazebo
|
447e6c2409
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-26 17:29:03 +08:00 |
|
gazebo
|
5361c0cabb
|
Waybill添加TipFee，在订单完成时也会更新，ActualFee肯定会有值，当成总费用
|
2019-12-26 17:28:28 +08:00 |
|
苏尹岚
|
c6a28afa4a
|
Accept Merge Request #117: (yonghui -> mark)
Merge Request: 投诉骑手
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/117
|
2019-12-26 17:03:11 +08:00 |
|
苏尹岚
|
e95a37789e
|
投诉骑手
|
2019-12-26 17:02:49 +08:00 |
|
苏尹岚
|
2f3514d901
|
投诉骑手
|
2019-12-26 17:00:36 +08:00 |
|
gazebo
|
381d1b2f21
|
调整加订单配送小费逻辑，添加美团外卖平台支持
|
2019-12-26 16:19:04 +08:00 |
|
gazebo
|
deadc8f563
|
UpdateOrderWaybillTip
|
2019-12-26 14:18:16 +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 |
|
苏尹岚
|
2ee7c74e2a
|
投诉骑手
|
2019-12-23 15:41:43 +08:00 |
|
苏尹岚
|
166f5320d3
|
投诉骑手
|
2019-12-23 15:27:06 +08:00 |
|
苏尹岚
|
480132cafe
|
组合名字函数修改
|
2019-12-20 15:59:42 +08:00 |
|
苏尹岚
|
0a8a0faec4
|
exprefix索引，order修改
|
2019-12-20 14:32:14 +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 |
|
苏尹岚
|
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
|
8b33ec5f5a
|
修复上次提交处理平台vendorOrgCode的bug
|
2019-12-09 15:45:09 +08:00 |
|
gazebo
|
ecedbe9be4
|
京东api区分vendorOrgCode
|
2019-12-09 15:16:21 +08:00 |
|
gazebo
|
38046bbe24
|
尽量减少对于api.JdAPI的直接依赖
|
2019-12-03 11:21:54 +08:00 |
|