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

06 Apr, 2022 8 commits
- 增加code换id · c7c679e9
  jiangxiulong authored Apr 06, 2022
  
  c7c679e9
- PRODUCT => NFT · bded5e0b
  jiangxiulong authored Apr 06, 2022
  
  bded5e0b
- Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411 · 5fbb81d8
  jiangxiulong authored Apr 06, 2022
  
  5fbb81d8
- config url · fb5a9911
  jiangxiulong authored Apr 06, 2022
  
  fb5a9911
- opt; · c6129d33
  张国柄 authored Apr 06, 2022
  
  c6129d33
- ~NFT交易查询接口; · 9131e43f
  张国柄 authored Apr 06, 2022
  
  9131e43f
- ~NFT开户接口; · f516c849
  张国柄 authored Apr 06, 2022
  
  f516c849
- +NFT商品上架，刷新NFT列表缓存逻辑; · 6b10e1b2
  张国柄 authored Apr 06, 2022
  
  6b10e1b2
02 Apr, 2022 32 commits
- Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411 · 4c486f50
  张国柄 authored Apr 02, 2022
  
  4c486f50
- +queue:创建藏品+NFT素材上传、声明; · 3036a748
  张国柄 authored Apr 02, 2022
  
  3036a748
- Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411 · 7eea90b7
  jiangxiulong authored Apr 02, 2022
  
  7eea90b7
- getSoldoutStatus、getSkuCanbuy null的判断 · faa9d5ed
  jiangxiulong authored Apr 02, 2022
  
  faa9d5ed
- nft修改购买逻辑 · 227a3e48
  anjiabin authored Apr 02, 2022
  
  227a3e48
- nft修改购买逻辑 · eb642eea
  anjiabin authored Apr 02, 2022
  
  eb642eea
- Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411 · 984000f2
  jiangxiulong authored Apr 02, 2022
  
  984000f2
- 增加预下单订单详情 · 15ac511f
  jiangxiulong authored Apr 02, 2022
  
  15ac511f
- Merge branch 'dev_nft_411' of... · 9ce70d9b
  anjiabin authored Apr 02, 2022
```
Merge branch 'dev_nft_411' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_nft_411
```
  9ce70d9b
- nft修改购买逻辑 · 26b51865
  anjiabin authored Apr 02, 2022
  
  26b51865
- 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