Commits · 23f8c9e04bfdd167a1bb9f2bdc0ba5154da60bc0 · 董敬伟 / liquidnet-bus-v1

02 Apr, 2022 23 commits
- Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411 · 23f8c9e0
  jiangxiulong authored Apr 02, 2022
  
  23f8c9e0
- 增加主动售罄soldoutStatus、是否购买skuCanbuy、是否隐藏skuAppear判断；delGoblinNftGoodsInfoListVo；商品列表售罄排序 · 3fc9e0b4
  jiangxiulong authored Apr 02, 2022
  
  3fc9e0b4
- nft修改购买逻辑 · 000d3e2e
  anjiabin authored Apr 02, 2022
  
  000d3e2e
- view · e5c79779
  jiangxiulong authored Apr 02, 2022
  
  e5c79779
- view · 3650293f
  jiangxiulong authored Apr 02, 2022
  
  3650293f
- admin 后台管理藏品订单导出 · 95c83b77
  jiangxiulong authored Apr 02, 2022
  
  95c83b77
- ~api.call:goblin.galaxy; · 3c6637bb
  张国柄 authored Apr 02, 2022
  
  3c6637bb
- 修改galaxy api相关 · 4eb0a10d
  anjiabin authored Apr 02, 2022
  
  4eb0a10d
- view · 971f01de
  jiangxiulong authored Apr 02, 2022
  
  971f01de
- Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411 · a5d72a47
  jiangxiulong authored Apr 02, 2022
  
  a5d72a47
- admin 后台管理藏品订单、退款列表完善 · c7863509
  jiangxiulong authored Apr 02, 2022
  
  c7863509
- ~api:添加藏品+款式名称属性赋值; · 01512825
  张国柄 authored Apr 02, 2022
  
  01512825
- Merge remote-tracking branch 'origin/master' into dev_nft_411 · 31520d57
  张国柄 authored Apr 02, 2022
  
  31520d57
- 支付成功回调增加销量 · 525eea9a
  jiangxiulong authored Apr 02, 2022
  
  525eea9a
- ~merge zxlnft -> nft_411; · 99795253
  张国柄 authored Apr 02, 2022
  
  99795253
- ~merge zxlnft -> nft_411; · da1fc04f
  张国柄 authored Apr 02, 2022
  
  da1fc04f
- ~merge zxlnft -> nft_411; · 69907c62
  张国柄 authored Apr 02, 2022
  
  69907c62
- Merge branch 'pre' into 'master' · 459d91dc
  周焕 authored Apr 02, 2022
```
修改 测试环境 redis 配置

See merge request !205
```
  459d91dc
- 修改测试环境 redis 配置 · a6ad427a
  胡佳晨 authored Apr 02, 2022
  
  a6ad427a
- Merge remote-tracking branch 'origin/master' into dev-zxlnft · 7b47b7ff
  张国柄 authored Apr 02, 2022
```
# Conflicts:
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisDataSourceUtil.java
#	liquidnet-bus-config/liquidnet-config/application-dev.yml
#	liquidnet-bus-service/pom.xml
```
  7b47b7ff
- nft修改消费相关代码 · 3619651a
  anjiabin authored Apr 02, 2022
  
  3619651a
- Merge remote-tracking branch 'origin/master' into dev_nft · a2bb494d
  张国柄 authored Apr 02, 2022
  
  a2bb494d
- ~api:开通数字账号补充持久化Mysql逻辑; · 410a5d11
  张国柄 authored Apr 02, 2022
  
  410a5d11
01 Apr, 2022 17 commits
- 退款订单created_at · f072033d
  jiangxiulong authored Apr 01, 2022
  
  f072033d
- nft修改购买逻辑 · 3865b3a7
  anjiabin authored Apr 01, 2022
  
  3865b3a7
- 超时关闭订单回滚库存和购买数量问题 · b026947e
  jiangxiulong authored Apr 01, 2022
  
  b026947e
- +queue:藏品声明查询及消费逻辑实现; · fe044358
  张国柄 authored Apr 01, 2022
  
  fe044358
- nft修改购买逻辑 · 7a911d6b
  anjiabin authored Apr 01, 2022
  
  7a911d6b
- 下单用户购买数量问题；回滚库存问题； · 5e30ec20
  jiangxiulong authored Apr 01, 2022
  
  5e30ec20
- nft修改购买逻辑 · eaffc852
  anjiabin authored Apr 01, 2022
  
  eaffc852
- nft修改购买逻辑 · 9639cc56
  anjiabin authored Apr 01, 2022
  
  9639cc56
- nft修改购买逻辑 · f51ee8f0
  anjiabin authored Apr 01, 2022
  
  f51ee8f0
- nft修改购买逻辑 · c8a6b462
  anjiabin authored Apr 01, 2022
  
  c8a6b462
- 350MB · 78b7d9c8
  jiangxiulong authored Apr 01, 2022
  
  78b7d9c8
- view · 02797469
  jiangxiulong authored Apr 01, 2022
  
  02797469
- view · 74835c33
  jiangxiulong authored Apr 01, 2022
  
  74835c33
- admin NFT订单管理增加短订单号查询 · 4704bc73
  jiangxiulong authored Apr 01, 2022
  
  4704bc73
- view · e4fb3a94
  jiangxiulong authored Apr 01, 2022
  
  e4fb3a94
- ˚ 藏品订单列表退款列表 · 1575714a
  jiangxiulong authored Apr 01, 2022
  
  1575714a
- nft修改购买逻辑 · ead181a1
  anjiabin authored Apr 01, 2022
  
  ead181a1