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 |
|
苏尹岚
|
a0c5949b3f
|
根据Excel更新京西价
|
2019-12-12 16:49:45 +08:00 |
|
苏尹岚
|
690453cd73
|
根据Excel更新京西价，修改异步任务中返回值
|
2019-12-12 16:25:27 +08:00 |
|
gazebo
|
e918d834ec
|
RefreshHistoryOrdersEarningPrice中不正确返回retVal给ParallelTask的问题修复
|
2019-12-12 16:16:02 +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
|
e94cd01982
|
京西菜市启用349454
|
2019-12-12 12:49:35 +08:00 |
|
gazebo
|
b21d652149
|
+djsw.UpdateSku
|
2019-12-12 12:02:15 +08:00 |
|
gazebo
|
a9f18ab056
|
去除JdStoreInfoCoordinateRecover中对于JdAPI的直接依赖
|
2019-12-12 11:41:02 +08:00 |
|
gazebo
|
96dd367d65
|
GetStoresSkusNew获取正确的京东平台vendorSkuID
|
2019-12-12 11:15:52 +08:00 |
|
gazebo
|
248a9299ce
|
GetSkusWithVendor,GetSkuCategoryWithVendor
apimanager的bug修改
|
2019-12-12 10:59:55 +08:00 |
|