liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,176 Commits 4 Branches 0 Tags
f98ea4eefafeae2c14ac8b637a953b9b9b663d3b
Commit Graph

57 Commits

Author SHA1 Message Date
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
苏尹岚
365cad0bfb 刷新历史订单结算价 2019-11-06 15:16:41 +08:00
苏尹岚
186f19e81b 刷新历史订单结算价 2019-11-06 14:32:18 +08:00
苏尹岚
bec26311fb 刷新历史订单结算价 2019-11-06 10:20:17 +08:00
苏尹岚
0a9ec20006 刷新历史订单结算价修改 2019-11-06 09:40:19 +08:00
苏尹岚
42db76c4ea 订单结算价刷新 2019-11-06 09:19:33 +08:00
苏尹岚
5c94299f6c 订单查询修改 2019-11-05 18:35:45 +08:00
苏尹岚
cf85ed0dd2 刷新订单历史结算价修改 2019-11-05 18:17:08 +08:00
苏尹岚
53a194a135 新增按订单刷新历史订单结算价 2019-11-05 16:47:43 +08:00
Rosy-zhudan
1c5c0bbbcc 修改反馈 2019-10-10 09:42:41 +08:00
Rosy-zhudan
aa6e94be89 Merge remote-tracking branch 'origin/mark' into don 2019-10-09 08:45:50 +08:00
gazebo
78a2c4270a GetStoresOrderSaleInfo相关的时间，改为订单创建时间，售后单还是以售后结束时间 2019-10-08 15:26:58 +08:00
Rosy-zhudan
0c0ac4fd69 触犯红线通知 2019-09-27 17:59:39 +08:00
Rosy-zhudan
6f579e7f1b 门店触犯红线通知 2019-09-27 16:30:18 +08:00
Rosy-zhudan
a7b2dc3abd 门店红线警告 2019-09-27 10:36:34 +08:00
zhudan
61c52330fd Accept Merge Request #4: (don -> mark) 
Merge Request: 门店评分-修改BUG
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/4
 2019-09-17 17:03:10 +08:00
xujianhua
9c7ae16186 Accept Merge Request #3: (don -> mark) 
Merge Request: 门店评分
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/3
 2019-09-17 11:12:33 +08:00
gazebo
1a54bdd91d - up 2019-08-20 14:28:00 +08:00
gazebo
6bd473839c - 修复GetStoresOrderSaleInfoNew中的bug 2019-08-20 14:07:31 +08:00
gazebo
7a91faec5b + GetStoresOrderSaleInfoNew 2019-08-20 10:59:47 +08:00
gazebo
14e3594455 - GetStoresOrderSaleInfo添加售后单信息 2019-08-16 11:08:09 +08:00
gazebo
485d402116 - GetStoresOrderSaleInfo中的时间从order_created_at至order_finished_at 2019-07-25 10:10:36 +08:00
gazebo
e2453e6832 + RefundOrder, PartRefundOrder 2019-07-22 11:08:02 +08:00
gazebo
d5752381c7 + partner.ListOrders 
+ AmendMissingOrders
 2019-07-18 18:46:14 +08:00
gazebo
9db43e273a - GetStores添加订单相关的查询条件 2019-06-28 11:25:26 +08:00
gazebo
61c0d0e9e0 - 美团外卖生成不同的售后单号，支持同一订单多个售后单 2019-05-27 17:44:29 +08:00