Commit Graph

3946 Commits

Author SHA1 Message Date
苏尹岚
7182ea87d5 更新调价包修改 2019-12-11 15:28:25 +08:00
苏尹岚
c0cd4fe692 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-11 13:46:41 +08:00
苏尹岚
77880d2318 addstoreVendorMap和update支持京西门店 2019-12-11 13:46:16 +08:00
gazebo
d22fef3bc7 去除一些对于jd_id与jd_sync_status的直接依赖 2019-12-11 11:43:52 +08:00
苏尹岚
2b49d2ba74 刷新京西调价包 2019-12-11 10:53:05 +08:00
苏尹岚
3cac9bfa32 刷新调价包 2019-12-11 10:49:29 +08:00
gazebo
73811a7bc6 fk 2019-12-11 10:28:38 +08:00
gazebo
a3e1521bb4 updateThingMapEntity 2019-12-11 10:13:35 +08:00
gazebo
6c98fecca6 修复GetSkuCategoryWithVendor中的bug 2019-12-11 09:22:17 +08:00
gazebo
3e6fdb0de1 up 2019-12-11 09:11:15 +08:00
gazebo
31704041a8 alpha环境启用isUseThingMap 2019-12-11 09:07:32 +08:00
gazebo
d566ee38e3 OnXXThing依赖mdoel.IsUseThingMap返回错误 2019-12-11 08:53:32 +08:00
gazebo
96d1147257 Merge branch 'master' into mark 2019-12-11 08:49:40 +08:00
gazebo
7ef2f0c23d 1000007223的配送管理问题。暂时先把SelfDeliverDelivered的状态限制放开 2019-12-11 08:49:15 +08:00
gazebo
794f4f084a up 2019-12-10 18:39:32 +08:00
gazebo
7721893692 fk 2019-12-10 18:34:58 +08:00
gazebo
517ae5245e CreateAct与AddStoreVendorMap必须要求vendorOrgCode
修复UpdateStoreVendorMap中的bug
2019-12-10 18:19:39 +08:00
苏尹岚
90edf2a581 addStoreVendorMap接口修改,支持京西平台 2019-12-10 18:01:49 +08:00
苏尹岚
9439aa17b6 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 17:52:48 +08:00
gazebo
b448f6996c 存回调活动时,修复没有保存VendorOrgCode的bug 2019-12-10 17:52:31 +08:00
苏尹岚
4d8504d39c Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 17:52:27 +08:00
苏尹岚
2e042d9c14 addStoreVnedorMap支持京西平台 2019-12-10 17:51:55 +08:00
gazebo
5363e34209 Merge branch 'master' of e.coding.net:rosydev/jx-callback 2019-12-10 17:47:19 +08:00
gazebo
99a00476ef GetSkusWithVendor中,排除GIF图片 2019-12-10 17:46:39 +08:00
苏尹岚
92761a332d 未营业门店修改 2019-12-10 17:31:17 +08:00
苏尹岚
ad10c9d5d4 Merge remote-tracking branch 'origin/master' into yonghui 2019-12-10 17:21:20 +08:00
苏尹岚
55257f839d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 17:20:54 +08:00
苏尹岚
ed67833601 根据excel刷新京西价 2019-12-10 17:20:49 +08:00
苏尹岚
04ab485bd7 addstorevendormap修改 2019-12-10 17:19:08 +08:00
gazebo
386e7a2980 comment 2019-12-10 16:52:23 +08:00
苏尹岚
933a18d362 Accept Merge Request #69: (yonghui -> master)
Merge Request: 商品图片判断
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/69
2019-12-10 15:57:47 +08:00
gazebo
8b9e36d59d 京东API几乎全部使用vendorOrgCode(除了GetSkus) 2019-12-10 15:52:09 +08:00
苏尹岚
4412af185c Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 15:51:57 +08:00
苏尹岚
cca21bda95 创建商品时图片判断问题 2019-12-10 15:51:44 +08:00
苏尹岚
d8dfbb696d Accept Merge Request #68: (yonghui -> master)
Merge Request: 推荐商品
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/68
2019-12-10 15:14:19 +08:00
gazebo
f4bd2fc1cc 饿百网页活动正确设置VendorOrgCode 2019-12-10 15:07:11 +08:00
苏尹岚
e83a438831 推荐商品 2019-12-10 15:06:01 +08:00
苏尹岚
b5b742deb4 推荐商品 2019-12-10 14:59:53 +08:00
gazebo
9cf63d1e80 fk 2019-12-10 14:58:40 +08:00
苏尹岚
3d0563a564 推荐商品 2019-12-10 14:56:23 +08:00
苏尹岚
7e4eef0e7a 推荐商品 2019-12-10 14:51:18 +08:00
苏尹岚
1320a80742 推荐商品 2019-12-10 14:49:53 +08:00
gazebo
d2168afd15 修复ConfirmSelfTakeOrders的bug 2019-12-10 14:48:39 +08:00
gazebo
1e4700057b ActMap添加VendorOrgCode
京东活动依赖VendorOrgCode
2019-12-10 14:17:05 +08:00
苏尹岚
b2ec8980a3 推荐商品 2019-12-10 11:54:24 +08:00
苏尹岚
414ee3bff6 推荐商品 2019-12-10 11:52:55 +08:00
苏尹岚
c4d0a62920 推荐商品 2019-12-10 11:51:23 +08:00
苏尹岚
7cbce85665 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 11:48:18 +08:00
苏尹岚
62569dfe55 导入Excel更新京西价,推荐商品 2019-12-10 11:47:52 +08:00
gazebo
bf597331f4 资源图片允许GIF 2019-12-10 11:35:13 +08:00