苏尹岚
|
3c46efe89d
|
读取永辉Excel
|
2019-11-13 09:59:20 +08:00 |
|
苏尹岚
|
95c37a847e
|
读取永辉Excel文件
|
2019-11-13 09:57:20 +08:00 |
|
苏尹岚
|
be69ca429c
|
读取excel
|
2019-11-13 08:19:50 +08:00 |
|
苏尹岚
|
7024fd4502
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-13 08:15:52 +08:00 |
|
苏尹岚
|
d40182a220
|
读取excel文件
|
2019-11-13 08:15:37 +08:00 |
|
gazebo
|
e8e7b324e0
|
美团拣货完成区分是否自配送
|
2019-11-12 18:51:46 +08:00 |
|
苏尹岚
|
290c3ac7b4
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-12 18:30:24 +08:00 |
|
苏尹岚
|
c39acd3d4f
|
时间缺省值修改
|
2019-11-12 18:30:06 +08:00 |
|
gazebo
|
2f117ec0d3
|
isStatusNewer中，美团订单在接单后就会收到新运单事件，因当前只支持一个TIMER，暂时舍弃三方配送调度，而要自动拣货调度
|
2019-11-12 18:27:38 +08:00 |
|
苏尹岚
|
6eabd6b488
|
读取excle
|
2019-11-12 18:22:00 +08:00 |
|
苏尹岚
|
2fc3a59df7
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-12 18:16:01 +08:00 |
|
gazebo
|
3f82dfb7da
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-12 18:11:48 +08:00 |
|
gazebo
|
7d21dbf0b2
|
引用jx
|
2019-11-12 18:11:32 +08:00 |
|
苏尹岚
|
a1efff61a4
|
读取永辉excel
|
2019-11-12 18:06:35 +08:00 |
|
苏尹岚
|
73a16aac04
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-12 17:52:12 +08:00 |
|
苏尹岚
|
8cf0aa8ddd
|
刷新历史订单结算价bug
|
2019-11-12 17:52:00 +08:00 |
|
gazebo
|
0b82b6a099
|
!!!修改美团订单的逻辑，不在用接受订单当成拣货完成，使用order/preparationMealComplete为实际拣货
|
2019-11-12 15:07:04 +08:00 |
|
gazebo
|
ca3404dd77
|
up
|
2019-11-12 14:02:42 +08:00 |
|
gazebo
|
18ff115fc6
|
SkuNamePrefixNames中去除“鱼腥草”
|
2019-11-12 11:30:26 +08:00 |
|
gazebo
|
a2a5ae7e50
|
修改结算活动时，不应该设置同步标志
|
2019-11-12 11:12:56 +08:00 |
|
gazebo
|
d96f50058f
|
修复取消结算活动时的bug
|
2019-11-12 11:00:25 +08:00 |
|
gazebo
|
89e39071e8
|
GetStoreListByLocation返回营业时间及门店状态
|
2019-11-12 10:32:53 +08:00 |
|
gazebo
|
5cf7e75aaf
|
UpdateUserByMiniInfo中更新头像或手机号
|
2019-11-12 09:29:19 +08:00 |
|
gazebo
|
977f08b13a
|
up
|
2019-11-11 18:29:44 +08:00 |
|
gazebo
|
2e02d05840
|
up
|
2019-11-11 18:23:02 +08:00 |
|
gazebo
|
3bc450baa2
|
up
|
2019-11-11 17:41:14 +08:00 |
|
gazebo
|
ef5e755544
|
TmpGetJxBadComments添加可选参数keyword
|
2019-11-11 17:33:19 +08:00 |
|
gazebo
|
e763aac526
|
新增修改用户手机号为微信绑定的手机号，user2/UpdateUserByMiniInfo
|
2019-11-11 16:50:21 +08:00 |
|
gazebo
|
281e2b436a
|
美团外卖评价正确设置TagList
|
2019-11-11 16:34:18 +08:00 |
|
gazebo
|
88b0241955
|
up
|
2019-11-11 14:36:14 +08:00 |
|
gazebo
|
b0856aee47
|
up
|
2019-11-11 14:31:46 +08:00 |
|
gazebo
|
2cb74791e5
|
OnOrderComments中找不到订单时，要用GetStoreDetailByVendorStoreID来更新门店ID
|
2019-11-11 13:58:56 +08:00 |
|
gazebo
|
71b01c44f9
|
美团评价自动回复
|
2019-11-11 11:59:27 +08:00 |
|
gazebo
|
f710444cbf
|
Store.ChangePriceType新增StoreChangePriceTypeManagedStore
|
2019-11-11 10:11:43 +08:00 |
|
苏尹岚
|
25ca7ed92f
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-11 09:52:12 +08:00 |
|
苏尹岚
|
9de07d2ea1
|
读取永辉excel文件
|
2019-11-11 09:51:10 +08:00 |
|
gazebo
|
83f9493352
|
价格包参数添加priceAdd
|
2019-11-11 09:20:14 +08:00 |
|
gazebo
|
6a37def14f
|
store_check.GetAllStoreSkus中添加调试，查找GetStoreSkus返回空的问题
|
2019-11-10 23:08:31 +08:00 |
|
gazebo
|
128d719a9c
|
修改MiniDecryptData中的bug
|
2019-11-08 18:25:46 +08:00 |
|
gazebo
|
a7164bb511
|
添加User.Avatar
|
2019-11-08 17:32:46 +08:00 |
|
徐建华
|
29e6559e17
|
Accept Merge Request #22: (su -> mark)
Merge Request: 刷新历史订单结算价
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/22
|
2019-11-08 15:35:41 +08:00 |
|
苏尹岚
|
68afef6a79
|
刷新历史订单结算价
|
2019-11-08 15:28:26 +08:00 |
|
gazebo
|
7d230ecf1e
|
修复删除饿百活动商品失败的bug
在删除门店商品失败时，尝试设置不可售
|
2019-11-08 15:24:51 +08:00 |
|
苏尹岚
|
29c92a0f12
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-08 15:23:28 +08:00 |
|
苏尹岚
|
b44f41d9d0
|
刷新历史订单结算价
|
2019-11-08 15:23:18 +08:00 |
|
gazebo
|
c5a01f1e9b
|
重构CalculateOrderDeliveryFee与QueryUserDeliveryAddress
|
2019-11-08 14:28:34 +08:00 |
|
苏尹岚
|
622d53cb4e
|
修改
|
2019-11-08 12:02:11 +08:00 |
|
苏尹岚
|
b417b731ff
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-08 11:54:21 +08:00 |
|
苏尹岚
|
0854c131cb
|
刷新历史订单结算价修改
|
2019-11-08 11:54:06 +08:00 |
|
gazebo
|
ae8b6a32c1
|
京东到家活动消息回调时，避免创建重复的活动
|
2019-11-08 09:39:43 +08:00 |
|