苏尹岚
|
aa3dd73b27
|
根据skuID关注部分商品
|
2019-12-25 15:11:49 +08:00 |
|
suyl
|
c124acc53a
|
商品前缀
|
2019-12-24 21:00:02 +08:00 |
|
苏尹岚
|
afa708ab99
|
畅销商品
|
2019-12-24 18:11:13 +08:00 |
|
苏尹岚
|
e811b3fc75
|
畅销商品
|
2019-12-24 17:51:27 +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 |
|
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 |
|
苏尹岚
|
471b2c63fc
|
畅销商品
|
2019-12-24 13:33:27 +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
|
20aeabd160
|
去掉SkuName.Name的单独索引
|
2019-12-23 18:28:21 +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 |
|
gazebo
|
01247221c4
|
SkuName.Upc改为*string（以支持null及添加唯一索引）
|
2019-12-23 16:15:58 +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 |
|
gazebo
|
868cce8445
|
UpdateActPrice4StoreSkuNameNew中EarningPrice逻辑修改
|
2019-12-23 10:43:41 +08:00 |
|
gazebo
|
d5e3457173
|
UpdateSkuSyncStatusForExPrefix改为使用thing_map
|
2019-12-20 16:21:05 +08:00 |
|
苏尹岚
|
480132cafe
|
组合名字函数修改
|
2019-12-20 15:59:42 +08:00 |
|
苏尹岚
|
0a8a0faec4
|
exprefix索引，order修改
|
2019-12-20 14:32:14 +08:00 |
|
苏尹岚
|
d6d4ab23bb
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-20 11:23:16 +08:00 |
|
gazebo
|
163b27ca6e
|
wxpay partner
|
2019-12-20 11:19:47 +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
|
850c35c9d9
|
调整京西商城支付
|
2019-12-19 16:20:10 +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 |
|
苏尹岚
|
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 |
|
苏尹岚
|
8cd09089a8
|
组合名字函数修改
|
2019-12-18 10:06:14 +08:00 |
|
苏尹岚
|
404a7b9040
|
jdsku冲突解决
|
2019-12-18 09:17:43 +08:00 |
|
gazebo
|
169efcaa92
|
修改刷新活动结束状态逻辑
|
2019-12-17 18:24:56 +08:00 |
|
gazebo
|
0cc04cc9d2
|
+OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel
|
2019-12-17 18:01:24 +08:00 |
|