Commit Graph

4111 Commits

Author SHA1 Message Date
苏尹岚
d1d49d464e 商品前缀名 2019-12-20 10:00:13 +08:00
苏尹岚
fa6f86a01f 商品名前缀 2019-12-20 09:30:52 +08:00
苏尹岚
0623da776b 商品关键字 2019-12-20 09:16:56 +08:00
苏尹岚
f5db2daee2 获取商品平台价 2019-12-20 08:57:52 +08:00
苏尹岚
5438e90021 获取某商品各平台价 2019-12-20 08:39:23 +08:00
苏尹岚
7f88bad413 商品前缀修改 2019-12-19 18:43:36 +08:00
苏尹岚
58e3066d19 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 18:40:58 +08:00
苏尹岚
dad7a5a926 获取某个商品平台价,商品名前缀 2019-12-19 18:40:46 +08:00
gazebo
4c698967d0 wxpay to wxpayapi 2019-12-19 16:29:15 +08:00
gazebo
850c35c9d9 调整京西商城支付 2019-12-19 16:20:10 +08:00
gazebo
415cc834fc maxStoreNameBind = 10000 2019-12-19 15:57:18 +08:00
苏尹岚
a3c236d281 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 15:24:31 +08:00
gazebo
84985a73fb 调整单的调试信息 2019-12-19 14:10:45 +08:00
gazebo
9498542e59 修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误
2019-12-19 12:07:15 +08:00
苏尹岚
480bfb4ed8 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 10:55:59 +08:00
苏尹岚
16823207c9 商品名前缀 2019-12-19 10:55:41 +08:00
gazebo
1f1036b503 每晚自动同步时,全量同步
用AmendAndPruneStoreStuff替代PruneMissingStoreSkus与AddCreateFlagForJxStoreSku
2019-12-19 09:55:10 +08:00
gazebo
5f1c793a37 mtwm的partner.FuncUpdateStoreSkus改为1 2019-12-19 08:28:44 +08:00
苏尹岚
be8a98dc90 同步商品名 2019-12-18 18:35:14 +08:00
苏尹岚
7fdb107e6f Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-18 15:19:39 +08:00
苏尹岚
990f3a2da2 pr修改 2019-12-18 15:19:22 +08:00
gazebo
2f9df63b10 必要时清除门店商品价格锁定时间 2019-12-18 12:25:29 +08:00
gazebo
af09cf0878 up 2019-12-18 12:06:52 +08:00
gazebo
51217978ba 门店商品添加锁定概念 2019-12-18 11:55:48 +08:00
苏尹岚
12a1a23ac1 商品关键字修改 2019-12-18 11:45:02 +08:00
gazebo
d1cb4a8c8b 饿百输出回调消息 2019-12-18 10:50:14 +08:00
gazebo
9a68b63b5e ebai.onOrderMsg 2019-12-18 10:41:04 +08:00
苏尹岚
2403c51764 修改不正常订单状态 2019-12-18 10:29:09 +08:00
苏尹岚
8cd09089a8 组合名字函数修改 2019-12-18 10:06:14 +08:00
苏尹岚
404a7b9040 jdsku冲突解决 2019-12-18 09:17:43 +08:00
gazebo
2659c51d91 up 2019-12-18 08:39:02 +08:00
gazebo
fc039600d5 DeleteSkusFromAct添加可选参数types 2019-12-18 08:30:32 +08:00
gazebo
169efcaa92 修改刷新活动结束状态逻辑 2019-12-17 18:24:56 +08:00
gazebo
0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel 2019-12-17 18:01:24 +08:00
苏尹岚
3feff96127 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 17:35:12 +08:00
苏尹岚
9fdae12a66 增加商品额外前缀 2019-12-17 17:34:51 +08:00
gazebo
2c69e934f8 限制饿百平台的商家分类名长度 2019-12-17 17:23:46 +08:00
gazebo
b6e8c33012 去除老的sku与category相关多门店平台接口 2019-12-17 16:51:45 +08:00
gazebo
64c7aec3c3 +jd.VenderAuditApplyCancelOrder 2019-12-17 15:55:46 +08:00
苏尹岚
b2994f13cd Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 14:10:59 +08:00
苏尹岚
a02dbdeacc 更改平台门店名称 2019-12-17 14:10:44 +08:00
gazebo
6e3ee7c9c1 京西商城订单取消 2019-12-17 14:05:43 +08:00
gazebo
d5f2273d79 +dao.LoadPendingOrders 2019-12-17 14:00:01 +08:00
gazebo
d7f9f30178 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-17 11:25:44 +08:00
gazebo
d38582709f act.SyncAct 2019-12-17 11:25:22 +08:00
苏尹岚
81ea19b80a Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 10:43:04 +08:00
苏尹岚
57fb6ac078 更新门店公告 2019-12-17 10:42:48 +08:00
gazebo
8d51d77529 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-17 10:07:23 +08:00
gazebo
16b772f13c Merge branch 'master' into mark 2019-12-17 10:07:13 +08:00
gazebo
272462f3eb up 2019-12-17 09:46:56 +08:00