Commits · 0a936419d79ded381585c564ea6f5e2d19d830c7 · 董敬伟 / liquidnet-bus-v1

24 May, 2022 3 commits
- Merge branch 'master' into hjc_goblin_list_unbox · 0a936419
  胡佳晨 authored May 24, 2022
  
  0a936419
- Merge branch 'pre' into 'master' · e33e076c
  Administrator authored May 24, 2022
```
Pre

See merge request !242
```
  e33e076c
- ~api:恢复我的藏品来源设置; · 6d8e1032
  zhanggb authored May 24, 2022
  
  6d8e1032
23 May, 2022 29 commits
- Merge branch 'hjc_goblin_list_fix' into pre · 94719480
  胡佳晨 authored May 23, 2022
  
  94719480
- 取消获取苹果支付类型需要token · ac3e0471
  胡佳晨 authored May 23, 2022
  
  ac3e0471
- bug：助理获取头像异常返回 · 2f49bc17
  高虎 authored May 23, 2022
  
  2f49bc17
- bug：助理头像保存异常问题 · 80874986
  高虎 authored May 23, 2022
  
  80874986
- 实名认证更新nft用户唯一id · e0ef24d7
  anjiabin authored May 23, 2022
  
  e0ef24d7
- ~api:我的藏品详情:盲盒开出的藏品对应skuid设置为盲盒skuid; · 2d441beb
  zhanggb authored May 23, 2022
  
  2d441beb
- 增加字段增加正常商品的开售时间 · 4756ddc3
  胡佳晨 authored May 23, 2022
  
  4756ddc3
- 帮乐乐提交 · f5dccfb6
  jiangxiulong authored May 23, 2022
  
  f5dccfb6
- ~GoblinGoodsSku-upchain; · e48577cc
  zhanggb authored May 23, 2022
  
  e48577cc
- bug：增加判断是否预约类型，情况为1不需要查询预约情况 · a2f044ed
  高虎 authored May 23, 2022
  
  a2f044ed
- Merge remote-tracking branch 'origin/hjc_goblin_list_fix' into hjc_goblin_list_fix · 7de9a618
  jiangxiulong authored May 23, 2022
  
  7de9a618
- 抽奖null · 56928f86
  jiangxiulong authored May 23, 2022
  
  56928f86
- Merge remote-tracking branch 'origin/hjc_goblin_list_fix' into hjc_goblin_list_fix · 33468047
  胡佳晨 authored May 23, 2022
  
  33468047
- 修改处于分批购时间段内下单过滤预约逻辑 · 050026d2
  胡佳晨 authored May 23, 2022
  
  050026d2
- ~api:我的藏品详情+skuId用于分享; · 8f127c97
  zhanggb authored May 23, 2022
  
  8f127c97
- ~api:我的藏品详情+skuId用于分享; · 4a1492bd
  zhanggb authored May 23, 2022
  
  4a1492bd
- 增加如果限购类型是指定用户并且白名单文件是空则类型为 -1 · 3a48364e
  胡佳晨 authored May 23, 2022
```
判断用户是否可购买逻辑
getListCanBuy 增加判断 如果状态是-1 则全部用户可购买
```
  3a48364e
- 增加如果限购类型是指定用户并且白名单文件是空则类型为 -1 · cae170ad
  胡佳晨 authored May 23, 2022
```
判断用户是否可购买逻辑
getListCanBuy 增加判断 如果状态是-1 则全部用户可购买
```
  cae170ad
- 增加分批购支持盲盒配置 · 8c5fd082
  胡佳晨 authored May 23, 2022
  
  8c5fd082
- Merge remote-tracking branch 'origin/hjc_goblin_list_fix' into hjc_goblin_list_fix · 3761b0f1
  胡佳晨 authored May 23, 2022
  
  3761b0f1
- 暂时提交 · 379e8fe9
  胡佳晨 authored May 23, 2022
  
  379e8fe9
- null != listId getListCanBuy · 6e95221a
  jiangxiulong authored May 23, 2022
  
  6e95221a
- Merge remote-tracking branch 'origin/hjc_goblin_list_fix' into hjc_goblin_list_fix · f1c75a9d
  胡佳晨 authored May 23, 2022
  
  f1c75a9d
- 库存回滚定时任务，增加开售后所有库存回滚 · 111172ef
  胡佳晨 authored May 23, 2022
  
  111172ef
- null != listId getListCanBuy · f5ff38be
  jiangxiulong authored May 23, 2022
  
  f5ff38be
- 修改 todo 逻辑修改开售时间 · e6815080
  胡佳晨 authored May 23, 2022
  
  e6815080
- 修改 todo 逻辑修改开售时间 · 8647af06
  胡佳晨 authored May 23, 2022
  
  8647af06
- 增加创建分批购活动名称效验 · e40361af
  胡佳晨 authored May 23, 2022
  
  e40361af
- order 删除所有库存回滚逻辑 · aaea548e
  胡佳晨 authored May 23, 2022
```
goblin 删除主动触发库存回滚逻辑
```
  aaea548e
22 May, 2022 8 commits
- Merge branch 'pre' into 'master' · 83b5501e
  张禹 authored May 22, 2022
```
Pre

See merge request !241
```
  83b5501e
- 修改 candy · 8d597ce7
  胡佳晨 authored May 22, 2022
  
  8d597ce7
- Merge branch 'hjc_goblin_list' into 'master' · 2f7401fd
  张禹 authored May 22, 2022
```
Hjc goblin list

See merge request !239
```
  2f7401fd
- Merge remote-tracking branch 'origin/hjc_goblin_list' into pre · 9efaf0d5
  jiangxiulong authored May 22, 2022
  
  9efaf0d5
- null == vo.getSaleStartTime() · 63b2abc4
  jiangxiulong authored May 22, 2022
  
  63b2abc4
- Merge remote-tracking branch 'origin/hjc_goblin_list' into pre · a69093ea
  jiangxiulong authored May 22, 2022
  
  a69093ea
- Merge remote-tracking branch 'origin/master' into hjc_goblin_list · 92aa28b2
  jiangxiulong authored May 22, 2022
  
  92aa28b2
- 10 · 63deb5f5
  jiangxiulong authored May 22, 2022
  
  63deb5f5