Commit Graph

520 Commits

Author SHA1 Message Date
苏尹岚
fa93efc754 订单状态修改 2020-01-14 19:02:44 +08:00
苏尹岚
4052e58799 Accept Merge Request #144: (tmp -> mark)
Merge Request: 刷新订单状态新增订单完成时间,畅销品自动关注放开城市限制
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/144
2020-01-14 18:26:38 +08:00
苏尹岚
89f64ecc97 刷新订单状态新增订单完成时间,畅销品自动关注放开城市限制 2020-01-14 18:22:21 +08:00
gazebo
b9f74f8a13 +api UploadFakeJdThingMap 2020-01-14 17:37:13 +08:00
gazebo
aad6c2c9b6 jdapi.ReorderCategories2 2020-01-14 14:43:23 +08:00
gazebo
d29b7b3686 globals.IsStoreSkuAct控制是否添加门店商品的平台活动信息 2020-01-13 14:17:50 +08:00
苏尹岚
e6c59c4850 同步错误返回 2020-01-09 14:02:32 +08:00
苏尹岚
386e6df25a Merge remote-tracking branch 'origin/mark' into su 2020-01-07 11:04:54 +08:00
gazebo
772c8f9cbe StoreSkuAct 2020-01-06 18:00:14 +08:00
gazebo
13922ead60 京东活动重构,删除与添加时遇错继续 2020-01-03 17:29:42 +08:00
gazebo
d7aa244528 jd act 2020-01-03 15:47:41 +08:00
gazebo
8c5c0bb83b 限制京东门名长度 2020-01-02 10:55:20 +08:00
苏尹岚
ab3abdfe6c 同步错误 2019-12-30 08:47:42 +08:00
gazebo
381d1b2f21 调整加订单配送小费逻辑,添加美团外卖平台支持 2019-12-26 16:19:04 +08:00
gazebo
deadc8f563 UpdateOrderWaybillTip 2019-12-26 14:18:16 +08:00
gazebo
6c13f113e8 jdapi.AdjustOrder处理重复 2019-12-25 21:54:16 +08:00
gazebo
880d2aedc0 配送相关接口调整 2019-12-25 15:32:58 +08:00
gazebo
c28247e6b7 +GoodsOrder.BaseFreightMoney 2019-12-23 15:35:34 +08:00
苏尹岚
a3c236d281 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 15:24:31 +08:00
gazebo
9498542e59 修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误
2019-12-19 12:07:15 +08:00
苏尹岚
404a7b9040 jdsku冲突解决 2019-12-18 09:17:43 +08:00
gazebo
0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel 2019-12-17 18:01:24 +08:00
苏尹岚
3feff96127 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 17:35:12 +08:00
苏尹岚
9fdae12a66 增加商品额外前缀 2019-12-17 17:34:51 +08:00
gazebo
b6e8c33012 去除老的sku与category相关多门店平台接口 2019-12-17 16:51:45 +08:00
gazebo
64c7aec3c3 +jd.VenderAuditApplyCancelOrder 2019-12-17 15:55:46 +08:00
苏尹岚
a02dbdeacc 更改平台门店名称 2019-12-17 14:10:44 +08:00
苏尹岚
57fb6ac078 更新门店公告 2019-12-17 10:42:48 +08:00
苏尹岚
6afbfb156a 刷新京东等级 2019-12-16 18:32:32 +08:00
苏尹岚
245e793ce3 根据名字查询upc码,获取京东等级修改 2019-12-16 16:12:56 +08:00
gazebo
eb78052a13 删除没有商家ID的京东SKU时,先设置商家ID后再删除 2019-12-16 11:56:35 +08:00
gazebo
ff6cd228a6 jd.postFakeMsg中正确设置AppKey 2019-12-16 10:19:54 +08:00
gazebo
cd267503f8 fk 2019-12-16 09:35:05 +08:00
gazebo
f1a7440e3e debug AppKey2OrgCode 2019-12-16 09:21:25 +08:00
gazebo
a576389993 up 2019-12-13 17:34:15 +08:00
gazebo
f941ea1807 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-13 17:28:23 +08:00
gazebo
7aad8398cf jd.isSkuMustHaveUpc 2019-12-13 17:28:04 +08:00
苏尹岚
3412f95380 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-13 16:55:10 +08:00
gazebo
032bb05157 京东平台,不为份的SKU,如果没有设置upc,自动生成一个假的 2019-12-13 16:41:16 +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
a6925cfb70 修复getStoreDetail没有得到vendorOrgCode的bug 2019-12-13 12:04:18 +08:00
gazebo
91e5bf3939 fk 2019-12-13 11:09:28 +08:00
gazebo
b7ca827ca7 去除getAPI("")调用,没有vendorOrgCode时报警 2019-12-13 10:59:21 +08:00
苏尹岚
a3cbbd46c6 同步错误返回冲突解决 2019-12-12 18:21:47 +08:00
苏尹岚
23249077cf 同步错误返回解决冲突 2019-12-12 18:10:13 +08:00
gazebo
4d15303149 处理创建分类是的父子关系 2019-12-12 16:00:01 +08:00
gazebo
a9f18ab056 去除JdStoreInfoCoordinateRecover中对于JdAPI的直接依赖 2019-12-12 11:41:02 +08:00
gazebo
248a9299ce GetSkusWithVendor,GetSkuCategoryWithVendor
apimanager的bug修改
2019-12-12 10:59:55 +08:00