Commit Graph

1563 Commits

Author SHA1 Message Date
苏尹岚
6afbfb156a 刷新京东等级 2019-12-16 18:32:32 +08:00
苏尹岚
f6c1b70484 Accept Merge Request #91: (yonghui -> mark)
Merge Request: 推荐分类
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/91
2019-12-16 18:08:02 +08:00
gazebo
b0cd64a358 +store/sku/GetStoreCategories 2019-12-16 18:05:26 +08:00
苏尹岚
c65032474e Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-16 16:52:54 +08:00
苏尹岚
be0bcf63f4 根据名字查询京东upc 2019-12-16 16:52:34 +08:00
gazebo
21bb51ebb0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-16 16:17:50 +08:00
gazebo
4772caf080 Store添加AutoReplyType,用于标识(订单)自动回复类型 2019-12-16 16:17:02 +08:00
苏尹岚
245e793ce3 根据名字查询upc码,获取京东等级修改 2019-12-16 16:12:56 +08:00
苏尹岚
1f1835fa2d 根据名字查询京东upc 2019-12-16 14:21:19 +08:00
苏尹岚
f5166d59b6 推荐分类修改 2019-12-16 11:47:08 +08:00
苏尹岚
8e9d712464 推荐分类修改 2019-12-16 11:28:03 +08:00
苏尹岚
efdcebdaa9 推荐分类修改 2019-12-16 11:16:34 +08:00
苏尹岚
146b801e5d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-16 11:03:10 +08:00
苏尹岚
f535cf2eeb 推荐分类修改 2019-12-16 11:02:20 +08:00
gazebo
ff6cd228a6 jd.postFakeMsg中正确设置AppKey 2019-12-16 10:19:54 +08:00
苏尹岚
fc5f344a5e Accept Merge Request #85: (yonghui -> mark)
Merge Request: 根据商品名查询京东upc码
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/85
2019-12-16 09:25:57 +08:00
苏尹岚
0f07668775 根据名字查京东upc码 2019-12-16 09:25:04 +08:00
gazebo
572fc64d7d 多平台商品库没有正常创建,直接跳过 2019-12-13 21:36:38 +08:00
gazebo
99efedfd92 多门店平台同步门店商品时,处理商品库没有创建的情况 2019-12-13 21:24:27 +08:00
苏尹岚
593612ed94 根据名字查询京东upc 2019-12-13 18:35:36 +08:00
苏尹岚
ebad9c1290 获取京东门店等级修改 2019-12-13 16:54:57 +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
苏尹岚
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
gazebo
c8f53121e0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-13 11:02:04 +08:00
苏尹岚
147a683177 门店价格修改 2019-12-13 10:49:29 +08:00
gazebo
2ddd16460a GetSkusWithVendor中取商品城市的bug修复 2019-12-13 10:47:58 +08:00
苏尹岚
8278de023d 同步错误返回冲突解决 2019-12-12 18:32:46 +08:00
苏尹岚
9717defad6 修改结算信息权限增加 2019-12-12 18:26:59 +08:00
苏尹岚
a3cbbd46c6 同步错误返回冲突解决 2019-12-12 18:21:47 +08:00
苏尹岚
23249077cf 同步错误返回解决冲突 2019-12-12 18:10:13 +08:00
苏尹岚
2116d5d812 Accept Merge Request #80: (yonghui -> mark)
Merge Request: 根据Excel修改京西价修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/80
2019-12-12 17:44:30 +08:00
苏尹岚
2a090b473d 根据Excel更新京西价修改 2019-12-12 17:43:09 +08:00
苏尹岚
67a48b515e Accept Merge Request #79: (yonghui -> mark)
Merge Request: 刷新历史订单结算价返回值修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/79
2019-12-12 17:35:38 +08:00
gazebo
f156cfcd1d up 2019-12-12 17:13:49 +08:00
gazebo
2bf513f4be sync2中没有正确使用vendorIDs与appOrgCodes的bug修复 2019-12-12 17:03:14 +08:00
苏尹岚
a0c5949b3f 根据Excel更新京西价 2019-12-12 16:49:45 +08:00
苏尹岚
690453cd73 根据Excel更新京西价,修改异步任务中返回值 2019-12-12 16:25:27 +08:00
gazebo
54de6440b7 fk 2019-12-12 16:03:54 +08:00
gazebo
8f27fb920b Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-12 16:00:12 +08:00
gazebo
4d15303149 处理创建分类是的父子关系 2019-12-12 16:00:01 +08:00
苏尹岚
1fc9037f0f Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-12 15:39:03 +08:00
苏尹岚
7468b67542 根据Excel更新京西价 2019-12-12 15:38:45 +08:00
gazebo
099ba06d04 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-12 15:02:17 +08:00
gazebo
231aac93a8 SyncSkus与SyncCategories错误继续 2019-12-12 15:01:01 +08:00
苏尹岚
99da2e9824 根据excel更新京西价 2019-12-12 14:40:20 +08:00
苏尹岚
dd58517099 京东api修改 2019-12-12 14:17:07 +08:00
苏尹岚
24a47c7649 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-12 13:38:38 +08:00
苏尹岚
19704b74bc 错误提示,门店评分修改 2019-12-12 13:38:06 +08:00
gazebo
a9f18ab056 去除JdStoreInfoCoordinateRecover中对于JdAPI的直接依赖 2019-12-12 11:41:02 +08:00