gazebo
|
b9f74f8a13
|
+api UploadFakeJdThingMap
|
2020-01-14 17:37:13 +08:00 |
|
gazebo
|
aad6c2c9b6
|
jdapi.ReorderCategories2
|
2020-01-14 14:43:23 +08:00 |
|
gazebo
|
4b5f4a4cf7
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-14 14:36:55 +08:00 |
|
gazebo
|
571b400229
|
fix bug in SyncReorderCategories
|
2020-01-14 14:36:19 +08:00 |
|
苏尹岚
|
7d57fa54b4
|
Accept Merge Request #140: (yonghui -> mark)
Merge Request: 订单详情增加用户信息
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/140
|
2020-01-13 18:26:19 +08:00 |
|
苏尹岚
|
0178156c65
|
订单详情增加用户信息
|
2020-01-13 18:18:58 +08:00 |
|
gazebo
|
975d204bfb
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-13 17:55:57 +08:00 |
|
gazebo
|
4751a14f0f
|
创建活动时在act_store_sku_map表中记录EarningPrice
|
2020-01-13 17:53:06 +08:00 |
|
苏尹岚
|
1630d0eac9
|
Accept Merge Request #139: (yonghui -> mark)
Merge Request: 中位价计算方式修改，乘除替换
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/139
|
2020-01-13 16:46:39 +08:00 |
|
苏尹岚
|
fa899540f9
|
中位价价格算法修改，乘除换一下
|
2020-01-13 16:43:06 +08:00 |
|
苏尹岚
|
c03702dacf
|
Accept Merge Request #138: (su -> mark)
Merge Request: 排除每天自动同步产生的错误
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/138
|
2020-01-13 15:14:54 +08:00 |
|
苏尹岚
|
3525a3ea56
|
排除每天自动同步
|
2020-01-13 15:14:15 +08:00 |
|
苏尹岚
|
b20295208c
|
Accept Merge Request #137: (yonghui -> mark)
Merge Request: 畅销品自动关注，暂时只整4个小城市
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/137
|
2020-01-13 14:55:12 +08:00 |
|
苏尹岚
|
8c9b4081c8
|
推荐商品自动关注，修改，以及暂时只整4个小城市
|
2020-01-13 14:53:40 +08:00 |
|
gazebo
|
d29b7b3686
|
globals.IsStoreSkuAct控制是否添加门店商品的平台活动信息
|
2020-01-13 14:17:50 +08:00 |
|
苏尹岚
|
ce74fb7128
|
畅销品查询终极修改
|
2020-01-13 12:51:14 +08:00 |
|
苏尹岚
|
31cc85e21c
|
调试信息输出
|
2020-01-13 12:01:25 +08:00 |
|
苏尹岚
|
0fd1880dae
|
输出调试信息
|
2020-01-13 11:56:57 +08:00 |
|
苏尹岚
|
fb36ee4c68
|
畅销品查询修改
|
2020-01-13 11:47:08 +08:00 |
|
苏尹岚
|
5595c56cb6
|
畅销品查询 eariningPrice修改
|
2020-01-13 10:51:35 +08:00 |
|
苏尹岚
|
353588b0db
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-13 10:51:10 +08:00 |
|
苏尹岚
|
a456557418
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-13 10:50:47 +08:00 |
|
gazebo
|
21accbf8fe
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-13 10:43:51 +08:00 |
|
gazebo
|
b60d792194
|
UpdateActPrice4StoreSkuNameNew中bug修复
|
2020-01-13 10:42:26 +08:00 |
|
苏尹岚
|
a17f8393cc
|
畅销品查询，查询活动增加payPercentage（bug）
|
2020-01-13 10:25:35 +08:00 |
|
苏尹岚
|
de55fb9cb2
|
畅销品查询，查询活动增加storeid（bug）
|
2020-01-13 10:12:14 +08:00 |
|
苏尹岚
|
0f2a475d81
|
Accept Merge Request #135: (yonghui -> mark)
Merge Request: 同步函数增加parentTask
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/135
|
2020-01-13 10:05:58 +08:00 |
|
苏尹岚
|
8d5f9cd9a6
|
畅销品查询修改
|
2020-01-13 10:00:40 +08:00 |
|
gazebo
|
3106f2a5d8
|
getAddressInfoFromCoord中处理找不到位置的情况。
|
2020-01-13 09:58:05 +08:00 |
|
苏尹岚
|
d6eed9671d
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-13 09:57:02 +08:00 |
|
苏尹岚
|
93d1c46408
|
畅销品查询修改
|
2020-01-13 09:56:42 +08:00 |
|
苏尹岚
|
f6d171936a
|
畅销品查询增加活动字段
|
2020-01-13 09:13:53 +08:00 |
|
苏尹岚
|
2f168f2c74
|
畅销品推荐增加活动字段
|
2020-01-13 09:12:02 +08:00 |
|
苏尹岚
|
c1fae06a73
|
Accept Merge Request #136: (su -> mark)
Merge Request: 同步错误返回合并
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/136
|
2020-01-13 09:08:36 +08:00 |
|
苏尹岚
|
78fcdeaf39
|
查询推荐品，新增活动系列字段
|
2020-01-13 09:03:02 +08:00 |
|
苏尹岚
|
aff821e09d
|
同步创建门店商品filedList返回修改
|
2020-01-10 17:57:26 +08:00 |
|
苏尹岚
|
65a54b603b
|
批量关注返回值修改
|
2020-01-10 17:44:47 +08:00 |
|
苏尹岚
|
b0771601f6
|
同步函数增加parentTask
|
2020-01-10 17:02:17 +08:00 |
|
苏尹岚
|
90cebe1a5a
|
Merge remote-tracking branch 'origin/mark' into su
|
2020-01-10 16:11:32 +08:00 |
|
苏尹岚
|
c12f6288de
|
改错地方了
|
2020-01-10 16:09:45 +08:00 |
|
苏尹岚
|
319a4779b1
|
饿百接口返回暂时加一个返回值保持兼容
|
2020-01-10 16:02:40 +08:00 |
|
gazebo
|
cce92601eb
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-10 15:57:16 +08:00 |
|
gazebo
|
4d4501cea0
|
Merge branch 'master' into mark
|
2020-01-10 15:56:58 +08:00 |
|
苏尹岚
|
4e4afc00f5
|
同步错误返回修改
|
2020-01-10 15:51:12 +08:00 |
|
苏尹岚
|
72be249c77
|
同步错误补全
|
2020-01-10 15:35:01 +08:00 |
|
苏尹岚
|
0cd7a5de3e
|
饿百api返回failedlist调整
|
2020-01-10 15:11:02 +08:00 |
|
苏尹岚
|
279e71a2ea
|
同步错误返回修改：从task中获取failedList才返回新的同步错
|
2020-01-10 14:38:25 +08:00 |
|
苏尹岚
|
c6f3e49be8
|
同步统一返回错误增加判断（尝试）
|
2020-01-10 14:32:09 +08:00 |
|
苏尹岚
|
d520cfe4bc
|
同步错误返回，新增同步错误类型，修改错误返回判断条件
|
2020-01-10 14:00:55 +08:00 |
|
苏尹岚
|
0bf8321524
|
Accept Merge Request #134: (yonghui -> mark)
Merge Request: 根据skuid批量关注可售商品-修改入参和组合数据
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/134
|
2020-01-10 13:32:41 +08:00 |
|