gazebo
|
4d4501cea0
|
Merge branch 'master' into mark
|
2020-01-10 15:56:58 +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 |
|
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 |
|
苏尹岚
|
70376fb6e7
|
冲突处理
|
2020-01-09 08:46:26 +08:00 |
|
苏尹岚
|
8f7e1fd1bb
|
操作日志
|
2020-01-09 08:31:44 +08:00 |
|
gazebo
|
27e13ecb99
|
fk
|
2020-01-08 18:40:39 +08:00 |
|
gazebo
|
ce41890da7
|
alipayAppID
|
2020-01-08 18:36:55 +08:00 |
|
gazebo
|
3ea689951b
|
updateStoresSkusWithoutSync中改价是判断价格是否一致
|
2020-01-08 18:32:29 +08:00 |
|
苏尹岚
|
fbabc83524
|
Accept Merge Request #131: (yonghui -> mark)
Merge Request: 增加同步返回错误
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/131
|
2020-01-08 18:09:56 +08:00 |
|
苏尹岚
|
7101582522
|
增加同步错误
|
2020-01-08 18:09:04 +08:00 |
|
gazebo
|
c196e7aab9
|
添加支付宝登录方式：alipaycode
|
2020-01-08 18:06:53 +08:00 |
|
苏尹岚
|
19ab93ab1e
|
同步错误
|
2020-01-08 16:07:36 +08:00 |
|
苏尹岚
|
90513226e9
|
同步错误
|
2020-01-08 15:50:55 +08:00 |
|
苏尹岚
|
2b3d7ce83a
|
同步错误
|
2020-01-08 15:35:53 +08:00 |
|
苏尹岚
|
74e52a0d94
|
Merge remote-tracking branch 'origin/mark' into su
|
2020-01-08 14:41:06 +08:00 |
|
苏尹岚
|
e5db4f27b1
|
操作日志
|
2020-01-08 14:26:31 +08:00 |
|
gazebo
|
510b9e8483
|
修复处理投递失败的BUG
|
2020-01-08 11:38:46 +08:00 |
|
gazebo
|
a56a5b1ec7
|
OrderSkuDiscountTypeTe
|
2020-01-08 11:12:12 +08:00 |
|
苏尹岚
|
b121695eef
|
Merge remote-tracking branch 'origin/mark' into su
|
2020-01-08 10:45:36 +08:00 |
|
苏尹岚
|
68494268ce
|
Accept Merge Request #130: (yonghui -> mark)
Merge Request: 根据skuid部分关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/130
|
2020-01-08 10:43:01 +08:00 |
|
苏尹岚
|
a3e4503081
|
根据skuid部分关注
|
2020-01-08 10:42:34 +08:00 |
|
苏尹岚
|
256c00d31b
|
Accept Merge Request #129: (yonghui -> mark)
Merge Request: 根据skuid 部分关注
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/129
|
2020-01-08 10:41:14 +08:00 |
|
gazebo
|
9c6b27ed56
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2020-01-08 10:39:19 +08:00 |
|
苏尹岚
|
82eb16ba66
|
商品部分关注
|
2020-01-08 10:39:16 +08:00 |
|
gazebo
|
b92cff3338
|
!token改为7部分
|
2020-01-08 10:38:55 +08:00 |
|
gazebo
|
4a51bfca9b
|
+StoresOrderSaleInfo.DistanceFreightMoney, WaybillTipMoney
|
2020-01-08 10:38:08 +08:00 |
|
苏尹岚
|
d7ae6eb9a2
|
屏蔽接口
|
2020-01-08 10:30:03 +08:00 |
|