苏尹岚
|
480bfb4ed8
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-19 10:55:59 +08:00 |
|
苏尹岚
|
16823207c9
|
商品名前缀
|
2019-12-19 10:55:41 +08:00 |
|
gazebo
|
1f1036b503
|
每晚自动同步时，全量同步
用AmendAndPruneStoreStuff替代PruneMissingStoreSkus与AddCreateFlagForJxStoreSku
|
2019-12-19 09:55:10 +08:00 |
|
苏尹岚
|
be8a98dc90
|
同步商品名
|
2019-12-18 18:35:14 +08:00 |
|
苏尹岚
|
7fdb107e6f
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-18 15:19:39 +08:00 |
|
苏尹岚
|
990f3a2da2
|
pr修改
|
2019-12-18 15:19:22 +08:00 |
|
gazebo
|
2f9df63b10
|
必要时清除门店商品价格锁定时间
|
2019-12-18 12:25:29 +08:00 |
|
gazebo
|
af09cf0878
|
up
|
2019-12-18 12:06:52 +08:00 |
|
gazebo
|
51217978ba
|
门店商品添加锁定概念
|
2019-12-18 11:55:48 +08:00 |
|
苏尹岚
|
8cd09089a8
|
组合名字函数修改
|
2019-12-18 10:06:14 +08:00 |
|
苏尹岚
|
404a7b9040
|
jdsku冲突解决
|
2019-12-18 09:17:43 +08:00 |
|
gazebo
|
169efcaa92
|
修改刷新活动结束状态逻辑
|
2019-12-17 18:24:56 +08:00 |
|
gazebo
|
0cc04cc9d2
|
+OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel
|
2019-12-17 18:01:24 +08:00 |
|
苏尹岚
|
9fdae12a66
|
增加商品额外前缀
|
2019-12-17 17:34:51 +08:00 |
|
苏尹岚
|
b2994f13cd
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-17 14:10:59 +08:00 |
|
苏尹岚
|
a02dbdeacc
|
更改平台门店名称
|
2019-12-17 14:10:44 +08:00 |
|
gazebo
|
d5f2273d79
|
+dao.LoadPendingOrders
|
2019-12-17 14:00:01 +08:00 |
|
苏尹岚
|
81ea19b80a
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-17 10:43:04 +08:00 |
|
苏尹岚
|
57fb6ac078
|
更新门店公告
|
2019-12-17 10:42:48 +08:00 |
|
gazebo
|
8d51d77529
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-17 10:07:23 +08:00 |
|
gazebo
|
16b772f13c
|
Merge branch 'master' into mark
|
2019-12-17 10:07:13 +08:00 |
|
gazebo
|
272462f3eb
|
up
|
2019-12-17 09:46:56 +08:00 |
|
gazebo
|
9e1ec73200
|
去除realEarningPrice
|
2019-12-17 09:35:28 +08:00 |
|
苏尹岚
|
365f69f8fa
|
刷新京东等级
|
2019-12-16 18:38:48 +08:00 |
|
苏尹岚
|
6afbfb156a
|
刷新京东等级
|
2019-12-16 18:32:32 +08:00 |
|
gazebo
|
b985b1a907
|
fk
|
2019-12-16 18:27:35 +08:00 |
|
gazebo
|
a0fee1f756
|
fk
|
2019-12-16 18:21:16 +08:00 |
|
gazebo
|
b0cd64a358
|
+store/sku/GetStoreCategories
|
2019-12-16 18:05:26 +08:00 |
|
gazebo
|
7296b5cca3
|
GetEffectiveActStoreSkuInfo, ActTypeAll
|
2019-12-16 16:46:05 +08:00 |
|
gazebo
|
84f2c8930c
|
GetEffectiveActStoreSkuInfo添加actType参数
修复ActStoreSkuParam2Model中调用GetEffectiveActStoreSkuInfo的bug
|
2019-12-16 16:39:39 +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 |
|
苏尹岚
|
1f1835fa2d
|
根据名字查询京东upc
|
2019-12-16 14:21:19 +08:00 |
|
苏尹岚
|
f5166d59b6
|
推荐分类修改
|
2019-12-16 11:47:08 +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 |
|
gazebo
|
f1a7440e3e
|
debug AppKey2OrgCode
|
2019-12-16 09:21:25 +08:00 |
|
gazebo
|
0ea872ab39
|
newGetFullStoreSkus调整
|
2019-12-13 22:23:17 +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
|
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
|
00c565777a
|
up
|
2019-12-13 11:01:44 +08:00 |
|
苏尹岚
|
147a683177
|
门店价格修改
|
2019-12-13 10:49:29 +08:00 |
|
gazebo
|
2ddd16460a
|
GetSkusWithVendor中取商品城市的bug修复
|
2019-12-13 10:47:58 +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 |
|