liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,222 Commits 4 Branches 0 Tags
af24c63a1f4ac8df886c2a4b427799dabd8094de
Commit Graph

673 Commits

Author SHA1 Message Date
苏尹岚
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
c730a28f19 act.QueryActs 2019-12-23 18:14:57 +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
苏尹岚
dad7a5a926 获取某个商品平台价，商品名前缀 2019-12-19 18:40:46 +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
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
苏尹岚
9fdae12a66 增加商品额外前缀 2019-12-17 17:34:51 +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
d5f2273d79 +dao.LoadPendingOrders 2019-12-17 14:00:01 +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
9e1ec73200 去除realEarningPrice 2019-12-17 09:35:28 +08:00
苏尹岚
365f69f8fa 刷新京东等级 2019-12-16 18:38:48 +08:00
苏尹岚
6afbfb156a 刷新京东等级 2019-12-16 18:32:32 +08:00
gazebo
b985b1a907 fk 2019-12-16 18:27:35 +08:00
gazebo
a0fee1f756 fk 2019-12-16 18:21:16 +08:00
gazebo
b0cd64a358 +store/sku/GetStoreCategories 2019-12-16 18:05:26 +08:00
gazebo
7296b5cca3 GetEffectiveActStoreSkuInfo, ActTypeAll 2019-12-16 16:46:05 +08:00
gazebo
84f2c8930c GetEffectiveActStoreSkuInfo添加actType参数 
修复ActStoreSkuParam2Model中调用GetEffectiveActStoreSkuInfo的bug
 2019-12-16 16:39:39 +08:00
苏尹岚
f5166d59b6 推荐分类修改 2019-12-16 11:47:08 +08:00
苏尹岚
146b801e5d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-16 11:03:10 +08:00
苏尹岚
6afa912e54 推荐分类修改 2019-12-16 11:03:00 +08:00
gazebo
f1a7440e3e debug AppKey2OrgCode 2019-12-16 09:21:25 +08:00
gazebo
0ea872ab39 newGetFullStoreSkus调整 2019-12-13 22:23:17 +08:00
苏尹岚
27acc3b814 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-13 16:38:35 +08:00
苏尹岚
334c012818 获取京东门店等级 2019-12-13 16:38:18 +08:00
gazebo
5a37a9cf28 up 2019-12-13 16:22:22 +08:00
gazebo
e0263c619c Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-13 15:21:09 +08:00
gazebo
a6925cfb70 修复getStoreDetail没有得到vendorOrgCode的bug 2019-12-13 12:04:18 +08:00
苏尹岚
5240bbe47f Accept Merge Request #82: (yonghui -> mark) 
Merge Request: 推荐商品分类sql修改，门店价格统计等修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/82
 2019-12-13 11:34:38 +08:00
苏尹岚
44653932ae 推荐商品，分类sql修改 2019-12-13 11:33:13 +08:00
gazebo
00c565777a up 2019-12-13 11:01:44 +08:00