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

08 Sep, 2021 2 commits
- 过滤优先券 · c75ce723
  胡佳晨 authored Sep 08, 2021
  
  c75ce723
- 下单 · e8495a2b
  胡佳晨 authored Sep 08, 2021
  
  e8495a2b
07 Sep, 2021 19 commits
- vo · 0acae6d8
  胡佳晨 authored Sep 07, 2021
  
  0acae6d8
- vo · 15f601a6
  胡佳晨 authored Sep 07, 2021
  
  15f601a6
- 全场券逻辑 · 6c607435
  胡佳晨 authored Sep 07, 2021
  
  6c607435
- 全场券逻辑 · a8483bb9
  胡佳晨 authored Sep 07, 2021
  
  a8483bb9
- 发放券+优先购; · af71d404
  张国柄 authored Sep 07, 2021
  
  af71d404
- 会员权益券编辑调整; · 9d4e9746
  张国柄 authored Sep 07, 2021
  
  9d4e9746
- 发放券逻辑调整; · 66622f95
  张国柄 authored Sep 07, 2021
  
  66622f95
- 改券 · 9138cd06
  胡佳晨 authored Sep 07, 2021
  
  9138cd06
- 用户端:券列表+discount赋值; · 7aed1b66
  张国柄 authored Sep 07, 2021
  
  7aed1b66
- 无规则券不可用 · d575064a
  胡佳晨 authored Sep 07, 2021
  
  d575064a
- Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund · 6f57412b
  胡佳晨 authored Sep 07, 2021
  
  6f57412b
- 无规则券不可用 · ef75daf0
  胡佳晨 authored Sep 07, 2021
  
  ef75daf0
- 会员退款申请API逻辑完善; · d96ecf79
  张国柄 authored Sep 07, 2021
  
  d96ecf79
- 增加转赠相关字段 · 210cde2e
  胡佳晨 authored Sep 07, 2021
  
  210cde2e
- Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund · 0e458c11
  张国柄 authored Sep 07, 2021
  
  0e458c11
- +会员卡列表; · f49834fb
  张国柄 authored Sep 07, 2021
  
  f49834fb
- 修改根据兑换码获取券详情接口 · 3e0a039c
  胡佳晨 authored Sep 07, 2021
  
  3e0a039c
- +会员卡列表; · 8ddddb59
  张国柄 authored Sep 07, 2021
  
  8ddddb59
- opt:发放券调整; · b7fb606c
  张国柄 authored Sep 07, 2021
  
  b7fb606c
06 Sep, 2021 5 commits
- 后台发放券校验调整; · a654ca39
  张国柄 authored Sep 06, 2021
  
  a654ca39
- 后台+数据校验; · eb8a40f0
  张国柄 authored Sep 06, 2021
  
  eb8a40f0
- Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund · b5e85a19
  张国柄 authored Sep 06, 2021
  
  b5e85a19
- 后台+数据校验; · 3d7248f6
  张国柄 authored Sep 06, 2021
  
  3d7248f6
- Merge remote-tracking branch 'origin/master' into dev_member_voucher_refund · e65cd97a
  张国柄 authored Sep 06, 2021
```
# Conflicts:
#	liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
```
  e65cd97a
05 Sep, 2021 1 commit
- Merge branch 'pre' into 'master' · 55c37482
  Administrator authored Sep 05, 2021
```
Pre

See merge request !31
```
  55c37482
03 Sep, 2021 13 commits
- kylin 演出列表 · fef0d957
  胡佳晨 authored Sep 03, 2021
```
order 下单
```
  fef0d957
- kylin 演出列表 · ce727e25
  胡佳晨 authored Sep 03, 2021
  
  ce727e25
- kylin 演出列表 · cdb763be
  胡佳晨 authored Sep 03, 2021
  
  cdb763be
- kylin 演出列表 · 9c1256ea
  胡佳晨 authored Sep 03, 2021
  
  9c1256ea
- kylin 演出列表 · dbf88cc0
  胡佳晨 authored Sep 03, 2021
  
  dbf88cc0
- kylin 演出列表 · 0c60f6e4
  胡佳晨 authored Sep 03, 2021
  
  0c60f6e4
- opt|会员券编辑+校验; · 8416da87
  张国柄 authored Sep 03, 2021
  
  8416da87
- opt; · 1b4c6f18
  张国柄 authored Sep 03, 2021
  
  1b4c6f18
- 后台管理API:修改券信息调整; · e54ed7b5
  张国柄 authored Sep 03, 2021
  
  e54ed7b5
- +API:我的会员权益券统计; · b294f49d
  张国柄 authored Sep 03, 2021
  
  b294f49d
- 会员权益详情+券适用规则; · 5534807d
  张国柄 authored Sep 03, 2021
  
  5534807d
- fix:api model; · 51328063
  张国柄 authored Sep 03, 2021
  
  51328063
- 会员订单+地区; · 6bb719b5
  张国柄 authored Sep 03, 2021
  
  6bb719b5