Commit Graph

4076 Commits

Author SHA1 Message Date
gazebo
fc039600d5 DeleteSkusFromAct添加可选参数types 2019-12-18 08:30:32 +08:00
gazebo
169efcaa92 修改刷新活动结束状态逻辑 2019-12-17 18:24:56 +08:00
gazebo
0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel 2019-12-17 18:01:24 +08:00
gazebo
2c69e934f8 限制饿百平台的商家分类名长度 2019-12-17 17:23:46 +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
gazebo
6e3ee7c9c1 京西商城订单取消 2019-12-17 14:05:43 +08:00
gazebo
d5f2273d79 +dao.LoadPendingOrders 2019-12-17 14:00:01 +08:00
gazebo
d7f9f30178 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-17 11:25:44 +08:00
gazebo
d38582709f act.SyncAct 2019-12-17 11:25:22 +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
苏尹岚
7d944f4ac6 刷新京东门店等级 2019-12-17 09:04:05 +08:00
苏尹岚
f5b7b03044 刷新京东门店等级 2019-12-17 08:57:51 +08:00
苏尹岚
2064cc11f5 刷新京东门店等级 2019-12-17 08:53:07 +08:00
苏尹岚
ac6372888d 刷新京东等级 2019-12-16 18:42:29 +08:00
苏尹岚
c55211fa53 刷新京东等级 2019-12-16 18:40:39 +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
苏尹岚
f6c1b70484 Accept Merge Request #91: (yonghui -> mark)
Merge Request: 推荐分类
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/91
2019-12-16 18:08:02 +08:00
gazebo
b0cd64a358 +store/sku/GetStoreCategories 2019-12-16 18:05:26 +08:00
苏尹岚
c65032474e Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-16 16:52:54 +08:00
苏尹岚
be0bcf63f4 根据名字查询京东upc 2019-12-16 16:52:34 +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
苏尹岚
245e793ce3 根据名字查询upc码,获取京东等级修改 2019-12-16 16:12:56 +08:00
苏尹岚
1b4de9a762 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-16 14:21:48 +08:00
苏尹岚
1f1835fa2d 根据名字查询京东upc 2019-12-16 14:21:19 +08:00
gazebo
eb78052a13 删除没有商家ID的京东SKU时,先设置商家ID后再删除 2019-12-16 11:56:35 +08:00
苏尹岚
f5166d59b6 推荐分类修改 2019-12-16 11:47:08 +08:00
苏尹岚
8e9d712464 推荐分类修改 2019-12-16 11:28:03 +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