Commit Graph

423 Commits

Author SHA1 Message Date
苏尹岚
0ed8bfbd92 门店营业数据全部按完成时间 2020-03-09 10:35:25 +08:00
苏尹岚
8ff1c37774 获取待拣货商品 2020-02-25 16:43:44 +08:00
苏尹岚
f054243c77 查询未拣货订单商品统计 2020-02-21 16:14:16 +08:00
gazebo
aafc7655e5 SkuID为0时,设置为JxSkuID 2020-02-21 09:54:19 +08:00
gazebo
4159a6198e 对于SkuID超范围的,改为设置成JxSkuID 2020-02-20 14:36:17 +08:00
gazebo
313cd9a226 up 2020-02-20 12:46:36 +08:00
gazebo
692b1a6f01 updateSingleOrderEarningPrice中直接使用v.SkuID的问题 2020-02-20 12:10:08 +08:00
苏尹岚
511da0f1a4 Accept Merge Request #190: (su -> mark)
Merge Request: 优化饿鲜达
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/190
2020-02-19 14:35:01 +08:00
苏尹岚
466d14a23e GetStoresOrderSaleInfo <= 24 小时,按完成时间查询 2020-02-19 13:55:14 +08:00
gazebo
b935ef3462 将京西菜市名字(及其它一些硬编码)做成配置项目 2020-02-18 19:11:47 +08:00
gazebo
8d0df4128d OnNewFakeJdOrder中调用RefreshOrderSkuRelated 2020-02-07 12:52:16 +08:00
苏尹岚
a948f71220 Accept Merge Request #181: (su -> mark)
Merge Request: 投诉骑手订单完成放开
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/181
2020-02-06 14:27:51 +08:00
苏尹岚
0807497a42 投诉骑手要求订单完成放开 2020-02-06 14:05:50 +08:00
gazebo
2ea4f30326 打印到家订单 2020-02-05 10:16:34 +08:00
gazebo
f118cd8331 到家商城的订单发通知消息
+Store.LinkStoreID
2020-02-04 16:20:09 +08:00
gazebo
1282ce1b4d 限制status.Remark长度 2020-01-29 11:07:10 +08:00
gazebo
4bf6896a3a 售后或差评时,更新订单隐私号 2020-01-29 10:39:08 +08:00
gazebo
80dc8a89c8 调试Waybill的ID为0的情况 2020-01-19 15:09:32 +08:00
苏尹岚
1869e4245e 顾客次数取消时间 2020-01-16 11:58:36 +08:00
苏尹岚
b94a1dd520 补漏订单状态是新订单则接单 2020-01-16 10:23:13 +08:00
苏尹岚
825d53b892 getOrderInfo字段修改 2020-01-16 09:19:42 +08:00
苏尹岚
6ff593ca83 getOrderInfo字段修改 2020-01-16 09:17:50 +08:00
苏尹岚
d6cefab677 订单详情获取顾客信息修改 2020-01-16 09:03:29 +08:00
苏尹岚
fa93efc754 订单状态修改 2020-01-14 19:02:44 +08:00
苏尹岚
6375cde824 小bug 2020-01-14 18:24:57 +08:00
苏尹岚
89f64ecc97 刷新订单状态新增订单完成时间,畅销品自动关注放开城市限制 2020-01-14 18:22:21 +08:00
苏尹岚
0178156c65 订单详情增加用户信息 2020-01-13 18:18:58 +08:00
gazebo
580b3c735f dao.QueryActs改参数skuID为skuIDs 2020-01-09 14:15:07 +08:00
gazebo
4a51bfca9b +StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney 2020-01-08 10:38:08 +08:00
苏尹岚
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