Commit Graph

4216 Commits

Author SHA1 Message Date
gazebo
6022d24634 GetOrderWaybillInfo可选参数:isGetPos支持获取运单骑手实时信息 2019-12-25 20:14:53 +08:00
gazebo
9e40e3942a Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-25 18:25:00 +08:00
苏尹岚
6f4cbedada 门店促销指数 2019-12-25 18:14:03 +08:00
苏尹岚
99c20d3712 订单预警 2019-12-25 18:11:45 +08:00
gazebo
7bec6fa523 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-25 16:58:46 +08:00
gazebo
1f03a84fa6 修复onAfsOrderMsg中afsOrder没有正确赋值的bug 2019-12-25 16:39:01 +08:00
苏尹岚
a8e3d512d2 Accept Merge Request #110: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/110
2019-12-25 15:35:38 +08:00
苏尹岚
11149487b5 订单预警 2019-12-25 15:34:55 +08:00
gazebo
d17a4ae594 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-25 15:33:17 +08:00
gazebo
880d2aedc0 配送相关接口调整 2019-12-25 15:32:58 +08:00
苏尹岚
aa3dd73b27 根据skuID关注部分商品 2019-12-25 15:11:49 +08:00
苏尹岚
938e42a86b 商品前缀 2019-12-25 13:49:23 +08:00
苏尹岚
b998a8938d 商品前缀 2019-12-25 11:55:07 +08:00
苏尹岚
c16e0dbab5 商品前缀 2019-12-25 11:49:25 +08:00
苏尹岚
f924735152 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-25 11:44:25 +08:00
苏尹岚
54fb48e6f1 根据skuID更新 2019-12-25 11:44:18 +08:00
gazebo
b8701ca850 upc 2019-12-25 11:11:03 +08:00
gazebo
043e5ae01d getSkuSaleStatus 2019-12-25 11:10:44 +08:00
gazebo
bc5baf2a7c Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-24 21:01:22 +08:00
suyl
c124acc53a 商品前缀 2019-12-24 21:00:02 +08:00
苏尹岚
9556634499 畅销商品 2019-12-24 18:24:01 +08:00
苏尹岚
afa708ab99 畅销商品 2019-12-24 18:11:13 +08:00
苏尹岚
e811b3fc75 畅销商品 2019-12-24 17:51:27 +08:00
gazebo
4f3e97268f Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-24 17:47:47 +08:00
gazebo
5504b43d4f ebai.CreateStoreSkus中,饿百平台有BUG,会导致新建一个之前删除的商品时,信息不会及时更新,强制刷新一下 2019-12-24 17:47:22 +08:00
苏尹岚
afd3bbfea3 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-24 17:27:31 +08:00
苏尹岚
ae043ed566 畅销商品 2019-12-24 17:27:06 +08:00
苏尹岚
73763af5fe Accept Merge Request #102: (yonghui -> mark)
Merge Request: 畅销商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/102
2019-12-24 16:40:55 +08:00
苏尹岚
a2fe344e18 根据skuid批量关注 2019-12-24 16:39:58 +08:00
gazebo
5ef3893f48 ForceUpdateVendorPrice中忽略不存在错 2019-12-24 16:29:31 +08:00
gazebo
9a76d07868 StoreSkuBind.MtwmID建索引 2019-12-24 15:29:07 +08:00
gazebo
26bfe04b7b up 2019-12-24 14:45:33 +08:00
苏尹岚
ac10d134ea 畅销商品 2019-12-24 14:07:28 +08:00
苏尹岚
7408b87742 畅销商品 2019-12-24 13:39:52 +08:00
苏尹岚
9a494425b6 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-24 13:33:44 +08:00
苏尹岚
471b2c63fc 畅销商品 2019-12-24 13:33:27 +08:00
gazebo
85d909234d 饿百在配送中状态时,尝试刷新TotalShopMoney 2019-12-24 12:12:34 +08:00
苏尹岚
86def54ea6 畅销商品 2019-12-24 11:55:52 +08:00
苏尹岚
52ea751e45 畅销商品 2019-12-24 11:52:34 +08:00
苏尹岚
eff05244dc 畅销商品 2019-12-24 11:52:23 +08:00
苏尹岚
f98ea4eefa 畅销商品 2019-12-24 11:49:08 +08:00
苏尹岚
322a298223 畅销商品 2019-12-24 11:41:47 +08:00
苏尹岚
5ab567ad77 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-24 11:39:28 +08:00
苏尹岚
70ecbf5114 畅销商品 2019-12-24 11:39:15 +08:00
gazebo
904acbf3de updateStoresSkusWithoutSync中
关注商品时,如果有删除的相应门店商品,使用恢复删除(而不是新建)
需要处理,在删除某个门店商品,同步失败的情况下,又把商品重新关注。
所以统一处理成恢复删除的记录,这样避免问题
2019-12-24 11:11:13 +08:00
gazebo
f6e7cb2551 dao.GetOrders中,后台导出订单SKU结算信息时,SKU的earning_price在没有结算信息时,填0。 2019-12-24 10:58:06 +08:00
gazebo
a8dbf89159 fk 2019-12-24 10:44:46 +08:00
gazebo
3d8781ca0f UpdateActPrice4StoreSkuNameNew 2019-12-24 10:41:46 +08:00
gazebo
e8352cd412 fk 2019-12-24 09:27:01 +08:00
gazebo
20aeabd160 去掉SkuName.Name的单独索引 2019-12-23 18:28:21 +08:00