Commit Graph

82 Commits

Author SHA1 Message Date
苏尹岚
fabed5e239 GetStoresOrderSaleInfo 查询修改 2020-02-19 14:09:49 +08:00
苏尹岚
466d14a23e GetStoresOrderSaleInfo <= 24 小时,按完成时间查询 2020-02-19 13:55:14 +08:00
suyl
9afb6adfbb Merge remote-tracking branch 'origin/mark' into su 2020-02-07 14:21:22 +08:00
suyl
9d203c90e7 Merge remote-tracking branch 'origin/mark' into su 2020-02-07 13:49:20 +08:00
gazebo
1855af8757 GetStoreOrderSkuList以订单完成时间为准 2020-02-07 13:48:36 +08:00
苏尹岚
8c602871e8 temporay up 2020-02-07 11:46:35 +08:00
gazebo
80fc4ce6a9 up 2020-02-06 16:46:40 +08:00
gazebo
ab77e0d220 GetStoreAfsOrderSkuList中多次退同一订单的情况处理 2020-02-06 16:32:29 +08:00
gazebo
56dc17a5af GetStoreOrderAfterTime考虑待支持订单 2020-02-05 16:09:18 +08:00
gazebo
0c5d62e55f 京西商城订单序号 2020-02-01 12:23:15 +08:00
gazebo
510b9e8483 修复处理投递失败的BUG 2020-01-08 11:38:46 +08:00
gazebo
9c6b27ed56 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2020-01-08 10:39:19 +08:00
gazebo
4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney 2020-01-08 10:38:08 +08:00
苏尹岚
a0d833d4ae 操作日志 2020-01-07 11:03:07 +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
苏尹岚
15c1c347b2 Merge remote-tracking branch 'origin/mark' into yonghui 2020-01-02 17:50:14 +08:00
gazebo
6251228b6c 订单导出payPercentage 2020-01-02 17:39:03 +08:00
苏尹岚
4eb559a4cb 差评 2020-01-02 16:32:02 +08:00
苏尹岚
0f2058de84 自动关注 2019-12-31 13:31:29 +08:00
苏尹岚
c22581636d 投诉骑手 2019-12-26 17:10:20 +08:00
苏尹岚
70e2d05549 投诉骑手 2019-12-25 18:39:13 +08:00
苏尹岚
3983e9d5a9 投诉骑手 2019-12-25 18:37:00 +08:00
gazebo
f6e7cb2551 dao.GetOrders中,后台导出订单SKU结算信息时,SKU的earning_price在没有结算信息时,填0。 2019-12-24 10:58:06 +08:00
苏尹岚
166f5320d3 投诉骑手 2019-12-23 15:27:06 +08:00
gazebo
d5f2273d79 +dao.LoadPendingOrders 2019-12-17 14:00:01 +08:00
gazebo
769a66a08a 自动完成内部自提单 2019-12-08 17:49:26 +08:00
gazebo
527659bf55 dao.GetOrders的排序调整 2019-12-05 08:35:31 +08:00
gazebo
457bd4b0a2 GetStoreOrderAfterTime排除内部单 2019-12-03 17:52:51 +08:00
gazebo
902c770515 调整GetOrders中的排序逻辑 2019-12-03 15:34:14 +08:00
徐建华
34a1f1d954 Accept Merge Request #48: (yonghui -> mark)
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
2019-12-02 14:37:09 +08:00
gazebo
351551bfe1 up 2019-12-02 14:24:23 +08:00
苏尹岚
d4edd5d06d 订单门钉归属修改 2019-12-02 11:30:36 +08:00
苏尹岚
410f671a36 冲突修改 2019-12-02 11:14:20 +08:00
苏尹岚
3c5afc31b6 接口位置移动,门店归属补漏修改,获取京东用户修改 2019-12-02 11:12:09 +08:00
gazebo
0a42beac8a +GetMyOrderCountInfo 2019-12-02 11:00:57 +08:00
苏尹岚
6c0c837fae 门店归属订单不漏 2019-11-29 17:48:29 +08:00
苏尹岚
519c4eadec Merge remote-tracking branch 'origin/mark' into yonghui 2019-11-29 11:09:48 +08:00
苏尹岚
34ee046ce2 获取京东用户修改,刷新订单结算价修改 2019-11-29 11:09:07 +08:00
gazebo
ab493a59fb +GetMyOrders 2019-11-29 10:35:38 +08:00
gazebo
7410da75fd +GetOrderPay
GetOrders添加参数isPurchase
2019-11-27 10:05:26 +08:00
苏尹岚
b44f41d9d0 刷新历史订单结算价 2019-11-08 15:23:18 +08:00
苏尹岚
0854c131cb 刷新历史订单结算价修改 2019-11-08 11:54:06 +08:00
苏尹岚
406c3e56e4 刷新历史订单结算价 2019-11-07 18:03:13 +08:00
苏尹岚
c5e4684492 刷新历史订单结算价 2019-11-07 16:54:51 +08:00
苏尹岚
98c1279ffe 刷新历史订单结算价 2019-11-07 11:17:01 +08:00
苏尹岚
9c5c282735 刷新历史订单修改 2019-11-07 10:55:26 +08:00
苏尹岚
3bf3f7ab5d 刷新历史订单结算价 2019-11-06 15:29:42 +08:00