Commit Graph

868 Commits

Author SHA1 Message Date
苏尹岚
4ef840788b Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 18:08:40 +08:00
苏尹岚
57babd9b32 未营业门店,授权,改营业范围 2019-12-09 18:08:06 +08:00
gazebo
c07eb1142e ThingMap.SyncStatus小驼峰 2019-12-09 17:53:40 +08:00
gazebo
75a2833510 分类与sku返回mapList信息 2019-12-09 17:37:56 +08:00
gazebo
8b33ec5f5a 修复上次提交处理平台vendorOrgCode的bug 2019-12-09 15:45:09 +08:00
gazebo
ecedbe9be4 京东api区分vendorOrgCode 2019-12-09 15:16:21 +08:00
苏尹岚
ec6945a457 推荐商品 2019-12-09 11:44:27 +08:00
苏尹岚
45481c825e 推荐商品 2019-12-09 11:42:29 +08:00
苏尹岚
78bdb3fb19 推荐商品 2019-12-09 11:38:49 +08:00
苏尹岚
0b95e6546f 推荐商品 2019-12-09 11:24:38 +08:00
苏尹岚
ac9a98c6b9 推荐商品 2019-12-09 09:58:36 +08:00
苏尹岚
459253c31a 推荐商品 2019-12-09 09:51:39 +08:00
苏尹岚
751dcc6040 推荐商品 2019-12-09 09:47:15 +08:00
苏尹岚
5d1f128e1d 价格统计 2019-12-09 09:31:34 +08:00
gazebo
769a66a08a 自动完成内部自提单 2019-12-08 17:49:26 +08:00
suyl
02d19cce82 门店价格 2019-12-07 21:38:30 +08:00
suyl
d1b2b666f6 门店价格 2019-12-07 21:05:33 +08:00
suyl
4caf019e70 门店价格插叙 2019-12-07 20:26:52 +08:00
苏尹岚
071d30efe7 门店价格 2019-12-06 18:33:50 +08:00
苏尹岚
06cea8a047 门店价格 2019-12-06 18:12:01 +08:00
苏尹岚
6e976487cb Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-06 17:22:54 +08:00
苏尹岚
0a6f7d6777 查询门店价格评分 2019-12-06 17:21:42 +08:00
gazebo
039f87c8dc !!!门店相关的API全部添加vendorOrgCode依赖 2019-12-06 17:20:55 +08:00
苏尹岚
5d556203fe 推荐商品 2019-12-06 15:49:48 +08:00
苏尹岚
f1b01506d3 推荐商品 2019-12-06 15:44:08 +08:00
苏尹岚
0046255791 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-06 15:26:18 +08:00
苏尹岚
d4d20f4ddf 推荐分类 2019-12-06 15:26:03 +08:00
gazebo
7fb09f99d1 整理DataResource相关的内容 2019-12-06 15:20:22 +08:00
gazebo
b9421e7979 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 14:55:34 +08:00
gazebo
92ecba727d 新SyncSkus基本能工作 2019-12-06 14:55:16 +08:00
苏尹岚
d35fe2c40d 推荐商品,分类 2019-12-06 13:50:27 +08:00
gazebo
6806ab202d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-06 09:45:22 +08:00
gazebo
9c2c65d266 去掉SkuCategoryWithVendor 2019-12-06 09:41:11 +08:00
苏尹岚
ab7201e973 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-06 09:05:16 +08:00
苏尹岚
c6abdbbd3e 价格参考 2019-12-06 09:04:55 +08:00
gazebo
d6d59e4ef5 !!!调整SkuStoreCatInfo与StoreSkuSyncInfo中SyncStatus的字段名 2019-12-05 18:22:12 +08:00
苏尹岚
496ff86ff4 Accept Merge Request #52: (yonghui -> mark)
Merge Request: 获取各平台未营业门店
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/52
2019-12-05 17:22:37 +08:00
gazebo
6066e49014 sync2.SyncCategories, SyncReorderCategories 2019-12-05 15:30:05 +08:00
苏尹岚
ab08935d4d 获取未营业门店 2019-12-05 15:06:45 +08:00
苏尹岚
8b29246088 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-05 14:47:08 +08:00
苏尹岚
9dd4c76074 获取各平台未营业门店 2019-12-05 14:46:52 +08:00
gazebo
1c05e4c1da dao.GetUsers keyword支持id查找 2019-12-05 14:00:15 +08:00
gazebo
efd358b0d4 up 2019-12-05 13:32:49 +08:00
gazebo
e742d88efd 加入ThingMap表示商品库的同步信息 2019-12-05 09:04:23 +08:00
gazebo
527659bf55 dao.GetOrders的排序调整 2019-12-05 08:35:31 +08:00
苏尹岚
621ae66f6e Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-04 17:56:08 +08:00
gazebo
e6004bea32 重构sku,skuname,category的CUD 2019-12-04 12:11:57 +08:00
gazebo
2635fb035a +ThingMap
+OnxxThing
2019-12-04 10:57:31 +08:00
gazebo
f69173bd2e 去掉注释"!!! 此函数不要将store_sku_bind中的vendor_price取出来放到StoreSkuSyncInfo.VendorPrice中,因为之后会依赖这个VendorPrice进行重算" 2019-12-04 10:01:05 +08:00
gazebo
457bd4b0a2 GetStoreOrderAfterTime排除内部单 2019-12-03 17:52:51 +08:00