Commits · b6a90a1e8012b5e53217a16a3b978c504aea7d8e · 董敬伟 / liquidnet-bus-v1

22 May, 2022 3 commits
- Merge remote-tracking branch 'origin/jxl_0512_nft_acc' into pre · b6a90a1e
  zhanggb authored May 22, 2022
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
```
  b6a90a1e
- Merge remote-tracking branch 'origin/master' into jxl_0512_nft_acc · ebbdb186
  zhanggb authored May 22, 2022
  
  ebbdb186
- Merge branch 'hjc_goblin_list' into pre · e0ebe06e
  胡佳晨 authored May 22, 2022
  
  e0ebe06e
21 May, 2022 3 commits
- 优化 · da953468
  jiangxiulong authored May 21, 2022
  
  da953468
- 增加定时任务 · 92007c4b
  胡佳晨 authored May 21, 2022
  
  92007c4b
- 优化 · eb8e42d9
  jiangxiulong authored May 21, 2022
  
  eb8e42d9
20 May, 2022 13 commits
- 修改nft数字账户开通消费监听个数为10 · a97b5913
  anjiabin authored May 20, 2022
  
  a97b5913
- 修改nft数字账户开通消费监听个数为20 · d8c8eae5
  anjiabin authored May 20, 2022
  
  d8c8eae5
- 数字账户开通增加耗时日志 · a00f30af
  anjiabin authored May 20, 2022
  
  a00f30af
- 修改一个身份证只能开通一个数字账户 · 39c6ed07
  anjiabin authored May 20, 2022
  
  39c6ed07
- 允许重试 · 26291983
  jiangxiulong authored May 20, 2022
  
  26291983
- Merge branch 'pre' into 'master' · 0766b5e6
  Administrator authored May 20, 2022
```
修改 下单接口 支持 新小程序支付

See merge request !238
```
  0766b5e6
- 修改下单接口支持新小程序支付 · b8858352
  胡佳晨 authored May 20, 2022
  
  b8858352
- openAccountInfo null · 521dd983
  jiangxiulong authored May 20, 2022
  
  521dd983
- Merge remote-tracking branch 'origin/jxl_0512_nft_acc' into jxl_0512_nft_acc · 9b46e227
  jiangxiulong authored May 20, 2022
  
  9b46e227
- payAgain · c99b0a96
  jiangxiulong authored May 20, 2022
  
  c99b0a96
- 修改一个身份证只能开通一个数字账户 · 97603b3e
  anjiabin authored May 20, 2022
  
  97603b3e
- 至信链用户id设置 · af2c8da9
  anjiabin authored May 20, 2022
  
  af2c8da9
- ~api:数字账号开通同步实名更新SQL调整; · f1989624
  zhanggb authored May 20, 2022
  
  f1989624
18 May, 2022 21 commits
- Merge branch 'pre' into 'master' · a05240f7
  张禹 authored May 18, 2022
```
Pre

See merge request !237
```
  a05240f7
- 修改分批购时间配置 · 3d13fbc1
  胡佳晨 authored May 18, 2022
  
  3d13fbc1
- 修改分批购时间配置 · ef21fc64
  胡佳晨 authored May 18, 2022
  
  ef21fc64
- 修改分批购时间配置 · ffeb4a04
  胡佳晨 authored May 18, 2022
  
  ffeb4a04
- ~api:数字账户开通消费逻辑调整:同步adam接口传参; · 06cbe3fd
  zhanggb authored May 18, 2022
  
  06cbe3fd
- nft订单回滚逻辑复制到 order内 · f3a5c96c
  胡佳晨 authored May 18, 2022
  
  f3a5c96c
- 1 · 3425e8ae
  胡佳晨 authored May 18, 2022
  
  3425e8ae
- 1 · 9182985a
  胡佳晨 authored May 18, 2022
  
  9182985a
- 修改nft用户注册 · d108fdec
  anjiabin authored May 18, 2022
  
  d108fdec
- 修改消费提交到slowly · fc0abb39
  胡佳晨 authored May 18, 2022
  
  fc0abb39
- Merge branch 'master' into hjc_goblin_list · 52adc2eb
  胡佳晨 authored May 18, 2022
  
  52adc2eb
- 修改消费日志 · 225c68a3
  胡佳晨 authored May 18, 2022
  
  225c68a3
- 修改分批购获取当前时间段和下一个时间段的bug · 41cf4fdd
  胡佳晨 authored May 18, 2022
  
  41cf4fdd
- 修改分批购获取当前时间段和下一个时间段的bug · 50dd4151
  胡佳晨 authored May 18, 2022
  
  50dd4151
- 票种状态不为6的时候不可购买 · cb91d8bb
  胡佳晨 authored May 18, 2022
  
  cb91d8bb
- goblin/artwork/info 增加arUrlIos、arUrlAndroid · d26c4b18
  jiangxiulong authored May 18, 2022
  
  d26c4b18
- 演出刷新状态脚本 · 68eabf0c
  胡佳晨 authored May 18, 2022
  
  68eabf0c
- 演出上线接口修改 · 43a54251
  胡佳晨 authored May 18, 2022
  
  43a54251
- xls 消费改为2个 · 044770a5
  胡佳晨 authored May 18, 2022
  
  044770a5
- 修改票种库存为0 并且票种下线后显示售罄的bug · ba959939
  胡佳晨 authored May 18, 2022
  
  ba959939
- 修改优先购/分批购库存回滚逻辑 · 7c1c6494
  胡佳晨 authored May 18, 2022
```
从 上个时间段内返回时间段内 改为 如果当前时间段不存在 则返回 下个时间段内
```
  7c1c6494