Commits · fff44e8c33f35b10439f83da42b1acf2a6cf874e · 董敬伟 / liquidnet-bus-v1 · GitLab

记得上下班打卡 | git大法好，push需谨慎

25 May, 2022 10 commits
- 修改搜索接口 · fff44e8c
  胡佳晨 authored May 25, 2022
  
  fff44e8c
- Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox · 2319decb
  胡佳晨 authored May 25, 2022
  
  2319decb
- 修改搜索接口 · 12c3dbef
  胡佳晨 authored May 25, 2022
  
  12c3dbef
- 盲盒计算库存的listId;判断是否有库存时候如果是分批购的盲盒不判断盲盒内藏品的开售时间 · 07a16922
  jiangxiulong authored May 25, 2022
  
  07a16922
- 回滚库存 listid用购买藏品的不管是普通还是盲盒 · 5d7a7063
  jiangxiulong authored May 25, 2022
  
  5d7a7063
- Merge remote-tracking branch 'origin/jxl_0525_nft_total' into hjc_goblin_list_unbox · ef94f49f
  jiangxiulong authored May 25, 2022
  
  ef94f49f
- 详情展示的总库存数量 · 59b4c145
  jiangxiulong authored May 25, 2022
  
  59b4c145
- 盲盒分批购listId用的盲盒的不是真正中奖藏品的 · 003654d1
  jiangxiulong authored May 25, 2022
  
  003654d1
- 增加分批购支持盲盒配置 · f538909b
  胡佳晨 authored May 25, 2022
```
增加 分批购 盲盒回滚逻辑
增加 nft商品详情 下个分段购开始时间
```
  f538909b
- 增加分批购支持盲盒配置 · 0d4bd919
  胡佳晨 authored May 25, 2022
```
增加 分批购 盲盒回滚逻辑
```
  0d4bd919
24 May, 2022 5 commits
- 增加分批购支持盲盒配置 · 99250889
  胡佳晨 authored May 24, 2022
  
  99250889
- 增加分批购支持盲盒配置 · db10662a
  胡佳晨 authored May 24, 2022
  
  db10662a
- 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 25 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