苏尹岚
|
de55fb9cb2
|
畅销品查询，查询活动增加storeid（bug）
|
2020-01-13 10:12:14 +08:00 |
|
苏尹岚
|
8d5f9cd9a6
|
畅销品查询修改
|
2020-01-13 10:00:40 +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 |
|
gazebo
|
208f89f9cf
|
饿百新运单事件要查询快递员信息，因为可能事件错序
|
2020-01-10 12:23:06 +08:00 |
|
gazebo
|
c9c7e3458e
|
Merge commit 'ff13ecc047d013a7a349681a584afb9bc009ea54'
|
2020-01-10 12:19:45 +08:00 |
|
苏尹岚
|
f0a8a84ae0
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-10 11:15:12 +08:00 |
|
苏尹岚
|
adf4407e93
|
根据skuid批量关注
|
2020-01-10 11:14:53 +08:00 |
|
gazebo
|
6616e57a5c
|
结算忽略重叠检查
|
2020-01-10 10:25:23 +08:00 |
|
gazebo
|
91d1d1d252
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-09 18:01:07 +08:00 |
|
苏尹岚
|
2f7cd0bb5a
|
Accept Merge Request #51: (su -> mark)
Merge Request: 同步错误返回
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/51
|
2020-01-09 17:53:37 +08:00 |
|
苏尹岚
|
e430c8ae59
|
同步错误返回
|
2020-01-09 17:53:13 +08:00 |
|
苏尹岚
|
08be46ca02
|
同步错误
|
2020-01-09 17:44:28 +08:00 |
|
gazebo
|
867f94a3f1
|
ActStoreSkuParam2Model重叠判断逻辑
|
2020-01-09 17:32:02 +08:00 |
|
苏尹岚
|
2b872e34cd
|
同步错误
|
2020-01-09 15:41:00 +08:00 |
|
苏尹岚
|
ff13ecc047
|
Accept Merge Request #133: (yonghui -> mark)
Merge Request: 推荐商品查询修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/133
|
2020-01-09 15:37:02 +08:00 |
|
苏尹岚
|
d594f137f7
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-09 15:31:51 +08:00 |
|
苏尹岚
|
5938092d0f
|
自动关注畅销品
|
2020-01-09 15:31:39 +08:00 |
|
苏尹岚
|
7bc490c7e8
|
根据skuid关注商品
|
2020-01-09 15:14:15 +08:00 |
|
苏尹岚
|
b4a2970c5b
|
同步错误
|
2020-01-09 14:57:24 +08:00 |
|
苏尹岚
|
3f151a07c5
|
Accept Merge Request #132: (yonghui -> mark)
Merge Request: 改规格->改价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/132
|
2020-01-09 14:47:11 +08:00 |
|
苏尹岚
|
8f78abc97d
|
冲突处理
|
2020-01-09 14:45:51 +08:00 |
|
苏尹岚
|
20fc83000e
|
改规格->改价
|
2020-01-09 14:42:39 +08:00 |
|
gazebo
|
580b3c735f
|
dao.QueryActs改参数skuID为skuIDs
|
2020-01-09 14:15:07 +08:00 |
|
苏尹岚
|
e6c59c4850
|
同步错误返回
|
2020-01-09 14:02:32 +08:00 |
|
gazebo
|
59d21cce7f
|
updateStoresSkusWithoutSync
|
2020-01-09 12:01:54 +08:00 |
|
苏尹岚
|
da3c177e54
|
build失败处理
|
2020-01-09 11:00:10 +08:00 |
|
苏尹岚
|
cda6d91dae
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2020-01-09 10:32:28 +08:00 |
|
gazebo
|
506eb7c929
|
dao.GetStoreSkus和dao.GetFullStoreSkus忽略sku与skuName的状态检查
|
2020-01-09 10:13:19 +08:00 |
|
gazebo
|
2629779e6d
|
up
|
2020-01-09 09:58:48 +08:00 |
|
苏尹岚
|
77e4fb078f
|
同步错误返回
|
2020-01-09 08:50:23 +08:00 |
|