Commit Graph

4039 Commits

Author SHA1 Message Date
gazebo
4772caf080 Store添加AutoReplyType,用于标识(订单)自动回复类型 2019-12-16 16:17:02 +08:00
gazebo
eb78052a13 删除没有商家ID的京东SKU时,先设置商家ID后再删除 2019-12-16 11:56:35 +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
苏尹岚
6afa912e54 推荐分类修改 2019-12-16 11:03:00 +08:00
苏尹岚
f535cf2eeb 推荐分类修改 2019-12-16 11:02:20 +08:00
gazebo
ff6cd228a6 jd.postFakeMsg中正确设置AppKey 2019-12-16 10:19:54 +08:00
gazebo
65d6ac4268 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-16 09:35:17 +08:00
gazebo
cd267503f8 fk 2019-12-16 09:35:05 +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
f1a7440e3e debug AppKey2OrgCode 2019-12-16 09:21:25 +08:00
gazebo
0ea872ab39 newGetFullStoreSkus调整 2019-12-13 22:23:17 +08:00
gazebo
572fc64d7d 多平台商品库没有正常创建,直接跳过 2019-12-13 21:36:38 +08:00
gazebo
99efedfd92 多门店平台同步门店商品时,处理商品库没有创建的情况 2019-12-13 21:24:27 +08:00
gazebo
fb7e3566ea 修复CalUpcCheckSum结果为10的bug 2019-12-13 20:00:53 +08:00
苏尹岚
3aa87369ec Accept Merge Request #84: (yonghui -> mark)
Merge Request: 根据名字查询京东upc编码等
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/84
2019-12-13 18:41:20 +08:00
gazebo
b428c0236e GenFakeUPC考虑校验规则 2019-12-13 18:40:51 +08:00
苏尹岚
593612ed94 根据名字查询京东upc 2019-12-13 18:35:36 +08:00
gazebo
f7418d2581 部署时,不再备份可执行文件 2019-12-13 17:58:29 +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
苏尹岚
ebad9c1290 获取京东门店等级修改 2019-12-13 16:54:57 +08:00
gazebo
032bb05157 京东平台,不为份的SKU,如果没有设置upc,自动生成一个假的 2019-12-13 16:41:16 +08:00
gazebo
7615cfa6bc 创建结算活动不判断门店状态 2019-12-13 16:40:37 +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
d20d98816e +GenFakeUPC 2019-12-13 15:18:06 +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
91e5bf3939 fk 2019-12-13 11:09:28 +08:00
gazebo
c8f53121e0 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-13 11:02:04 +08:00
gazebo
00c565777a up 2019-12-13 11:01:44 +08:00
gazebo
b7ca827ca7 去除getAPI("")调用,没有vendorOrgCode时报警 2019-12-13 10:59:21 +08:00
苏尹岚
147a683177 门店价格修改 2019-12-13 10:49:29 +08:00
gazebo
2ddd16460a GetSkusWithVendor中取商品城市的bug修复 2019-12-13 10:47:58 +08:00
苏尹岚
9717defad6 修改结算信息权限增加 2019-12-12 18:26:59 +08:00
gazebo
f6baae63ee Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-12 18:02:30 +08:00
gazebo
2915c41fc3 去除BaseTask.run中的recover 2019-12-12 18:02:10 +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
苏尹岚
4bf7105cab 刷新历史订单结算价修改 2019-12-12 17:32:55 +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