苏尹岚
|
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 |
|
gazebo
|
ccc0d3dfda
|
updateThingMapEntity
|
2019-12-12 10:02:37 +08:00 |
|
gazebo
|
d8c77cfb6e
|
up
|
2019-12-12 09:32:36 +08:00 |
|
gazebo
|
ce9b0f2661
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-12 09:19:44 +08:00 |
|
gazebo
|
29bc986e45
|
jd2配置
SyncSkuNames
SyncCategorys
|
2019-12-12 09:18:44 +08:00 |
|
苏尹岚
|
53d4b6e987
|
Accept Merge Request #76: (yonghui -> mark)
Merge Request: 新增可修改结算信息权限人员
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/76
|
2019-12-12 08:19:45 +08:00 |
|
苏尹岚
|
4a4342def0
|
新增可修改结算信息权限人员
|
2019-12-12 08:17:42 +08:00 |
|
gazebo
|
2168cf9731
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-11 22:31:07 +08:00 |
|
gazebo
|
db85de7454
|
+FullSyncVendorStuff
|
2019-12-11 22:30:32 +08:00 |
|
苏尹岚
|
8d93079655
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-11 18:12:33 +08:00 |
|
苏尹岚
|
d08b64d1d9
|
分类状态和分类图片
|
2019-12-11 18:12:09 +08:00 |
|
gazebo
|
2156c77dbf
|
UploadImg添加vendorOrgCode参数
|
2019-12-11 17:42:56 +08:00 |
|
gazebo
|
bc10962095
|
修复GetActStoreSkuVendorList中sqlParams的错误
|
2019-12-11 17:29:33 +08:00 |
|
gazebo
|
592ed3c252
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-11 16:55:05 +08:00 |
|
gazebo
|
118ad50abd
|
store_sku_check对于vendorOrgCode的正确依赖
|
2019-12-11 16:27:10 +08:00 |
|
gazebo
|
ef5ec63951
|
StoreExt的StoreMaps与CourierMaps从map数组改为struct数组
|
2019-12-11 16:04:44 +08:00 |
|
苏尹岚
|
59df3488c4
|
根据excel改惊喜价
|
2019-12-11 16:04:42 +08:00 |
|
苏尹岚
|
d74a0d8079
|
根据Excel更新京西价
|
2019-12-11 16:01:58 +08:00 |
|
gazebo
|
95a669476e
|
-partner.ReadSku
修改partner.GetSkus原型，添加vendorOrgCode，去除skuName
|
2019-12-11 15:44:42 +08:00 |
|
苏尹岚
|
044750478c
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-11 15:29:01 +08:00 |
|
苏尹岚
|
7182ea87d5
|
更新调价包修改
|
2019-12-11 15:28:25 +08:00 |
|
gazebo
|
ccba718569
|
全部启用useThingMap
|
2019-12-11 15:02:32 +08:00 |
|
gazebo
|
37ae9df27b
|
果园启用useThingMap
|
2019-12-11 14:58:43 +08:00 |
|
gazebo
|
b61862acec
|
菜市启用useThingMap
|
2019-12-11 14:53:00 +08:00 |
|
gazebo
|
3a2599ad23
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-11 14:43:24 +08:00 |
|
gazebo
|
1817d67ca7
|
beta启用useThingMap
|
2019-12-11 14:43:04 +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 |
|