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 |
|
gazebo
|
33a628106b
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 18:23:34 +08:00 |
|
gazebo
|
ee0b400294
|
SkuName添加Upc, DeletedAt唯一索引
|
2019-12-23 18:23:05 +08:00 |
|
gazebo
|
c730a28f19
|
act.QueryActs
|
2019-12-23 18:14:57 +08:00 |
|
苏尹岚
|
d86a0e1b26
|
Accept Merge Request #101: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/101
|
2019-12-23 18:12:48 +08:00 |
|
苏尹岚
|
a1bdf6cde3
|
订单预警
|
2019-12-23 18:12:03 +08:00 |
|
苏尹岚
|
758e0f23f2
|
订单预警
|
2019-12-23 17:50:11 +08:00 |
|
gazebo
|
65c09d395b
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 17:27:38 +08:00 |
|
gazebo
|
54aeef6b4a
|
fk
|
2019-12-23 17:27:30 +08:00 |
|
苏尹岚
|
7800543f22
|
Accept Merge Request #100: (yonghui -> mark)
Merge Request: 订单预警
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/100
|
2019-12-23 17:02:56 +08:00 |
|
苏尹岚
|
1e640ad6f4
|
订单预警
|
2019-12-23 17:01:58 +08:00 |
|
gazebo
|
01247221c4
|
SkuName.Upc改为*string（以支持null及添加唯一索引）
|
2019-12-23 16:15:58 +08:00 |
|
gazebo
|
23136cc467
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-23 15:44:42 +08:00 |
|
gazebo
|
fb599e610c
|
fix ebai BaseFreightMoney
|
2019-12-23 15:44:25 +08:00 |
|
苏尹岚
|
2ee7c74e2a
|
投诉骑手
|
2019-12-23 15:41:43 +08:00 |
|
苏尹岚
|
943c4a723d
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-23 15:38:01 +08:00 |
|
gazebo
|
c28247e6b7
|
+GoodsOrder.BaseFreightMoney
|
2019-12-23 15:35:34 +08:00 |
|
苏尹岚
|
a8439f38e1
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-23 15:29:27 +08:00 |
|
苏尹岚
|
166f5320d3
|
投诉骑手
|
2019-12-23 15:27:06 +08:00 |
|