gazebo
|
0f0e1bb5a3
|
SendUserMessage中限制钉钉消息长度的BUG
|
2019-11-15 21:33:37 +08:00 |
|
gazebo
|
da69dd0216
|
修复添加商品可售时间引入的bug
|
2019-11-15 18:12:59 +08:00 |
|
gazebo
|
ddbb1622fa
|
debug
|
2019-11-15 18:03:49 +08:00 |
|
苏尹岚
|
9e204e8595
|
Accept Merge Request #25: (su -> mark)
Merge Request: 定时刷新商品可售状态
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/25
|
2019-11-15 16:57:33 +08:00 |
|
苏尹岚
|
b2e82bada8
|
定时刷新
|
2019-11-15 16:56:46 +08:00 |
|
gazebo
|
14721125d7
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-15 16:40:42 +08:00 |
|
gazebo
|
0b19a6387d
|
处理美团平台商品AppFood有id但sku没有id的情况
|
2019-11-15 16:40:07 +08:00 |
|
苏尹岚
|
a8b954cd89
|
刷新商品可售状态
|
2019-11-15 13:52:56 +08:00 |
|
苏尹岚
|
449f55d87a
|
更新门店营业时间
|
2019-11-15 13:46:10 +08:00 |
|
苏尹岚
|
d08dbc7a49
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-15 11:59:15 +08:00 |
|
苏尹岚
|
4d013ad28b
|
定时刷新商品可售状态
|
2019-11-15 11:58:53 +08:00 |
|
gazebo
|
9cc35f5f10
|
京西商城订单
|
2019-11-15 10:43:20 +08:00 |
|
苏尹岚
|
744d28d36f
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-15 10:07:56 +08:00 |
|
苏尹岚
|
a929498359
|
定时刷新商品可售状态
|
2019-11-15 10:03:57 +08:00 |
|
苏尹岚
|
7305f1a6af
|
定时更改商品可售状态
|
2019-11-15 09:47:10 +08:00 |
|
苏尹岚
|
bcc534289a
|
定时刷新商品可售状态
|
2019-11-14 18:03:34 +08:00 |
|
gazebo
|
1de4525ff6
|
up
|
2019-11-14 16:24:49 +08:00 |
|
gazebo
|
9a67c62892
|
商家分类重排序后，没有正确处理单门店平台的同步逻辑修复
|
2019-11-14 16:14:56 +08:00 |
|
苏尹岚
|
3da95b29f8
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-14 11:45:32 +08:00 |
|
苏尹岚
|
e15e7ed9e2
|
定时修改商品可售状态
|
2019-11-14 11:45:16 +08:00 |
|
gazebo
|
921f705ca6
|
Merge branch 'mark'
|
2019-11-14 11:23:36 +08:00 |
|
gazebo
|
7b9e77ba2a
|
mtwmapi.SkuInfo.Weight类型从int修正为string，相应调整
|
2019-11-14 11:22:18 +08:00 |
|
苏尹岚
|
32eb1a6dbe
|
读取永辉Excel
|
2019-11-13 18:18:12 +08:00 |
|
苏尹岚
|
8df7f897fa
|
读取永辉Excel
|
2019-11-13 18:11:58 +08:00 |
|
gazebo
|
5935c94aca
|
避免价格包因为有小数导致的问题
|
2019-11-13 17:30:54 +08:00 |
|
苏尹岚
|
705aa5153c
|
读取永辉Excel
|
2019-11-13 17:06:18 +08:00 |
|
gazebo
|
ae5a923d38
|
GetStoreSkus添加参数：actVendorID表示要取哪个平台的活动信息
|
2019-11-13 16:25:44 +08:00 |
|
gazebo
|
7f231d1f6a
|
StoreSkuBind添加JxPrice
|
2019-11-13 15:16:11 +08:00 |
|
gazebo
|
2ca58bd582
|
生成京西商城订单初始。。。
|
2019-11-13 10:49:55 +08:00 |
|
苏尹岚
|
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 |
|