Commits · 96d49c4c5838070536e7cc22112cf2ba2bc824e9 · order-group-application / order-group

04 Nov, 2021 5 commits
- 删除无效日志 · 96d49c4c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 04, 2021
  96d49c4c Browse Files
- 解决前人留下的坑: 校验套餐商品的时候会导致校验失败 · effccad2
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 04, 2021
  effccad2 Browse Files
- 新增字段用于优惠券使用门槛 · 4568d9fa
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 04, 2021
  4568d9fa Browse Files
- 新增字段用于优惠券使用门槛 · ef2565a0
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 04, 2021
  ef2565a0 Browse Files
- 准备开发券的使用门槛需求 · 8b9e5538
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 04, 2021
  8b9e5538 Browse Files
03 Nov, 2021 4 commits
- 修复商品参与活动,优惠金额的变动,导致商品服务校验商品原价不通过,清空了购物车 · e29a7df3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 03, 2021
  e29a7df3 Browse Files
- 修复商品参与活动,优惠金额的变动,导致商品服务校验商品原价不通过,清空了购物车 · d7abfef8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 03, 2021
  d7abfef8 Browse Files
- 打个日志,看看券传参问题 · 05085f88
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 03, 2021
  05085f88 Browse Files
- 打个日志,看看券传参问题 · d5efb3d2
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 03, 2021
  d5efb3d2 Browse Files
02 Nov, 2021 4 commits
- 取消券, 匹配券商品信息 · 59ed335b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 02, 2021
  59ed335b Browse Files
- Merge branch 'master' into KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh · 811339ec
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  周晓航 committed Nov 02, 2021
  811339ec Browse Files
- merge 冲突 · 43c308a1
  查志伟 committed Nov 02, 2021
  
  43c308a1 Browse Files
- Merge branch '20211019-无单收银-zhiwei.zha' · b87c808b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed Nov 02, 2021
  b87c808b Browse Files
01 Nov, 2021 16 commits
- Merge branch 'fix-订单套餐设置错误问题-订单' · a4d5acc8
  周晓航 committed Nov 01, 2021
  
  a4d5acc8 Browse Files
- 修复.删除错误代码回退 · cfa3bc23
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  cfa3bc23 Browse Files
- 修复订单记录套餐价格错误 · fbcbf20b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  fbcbf20b Browse Files
- Merge branch 'master' into fix-套餐商品原价问题 · d3511fe1
  周晓航 committed Nov 01, 2021
  
  d3511fe1 Browse Files
- 回退上午修复问题的代码, 因为不确定是否跟着发版 · 763ecb50
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  763ecb50 Browse Files
- 删除合并代码导致的错误 · 386f83d1
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  386f83d1 Browse Files
- 修复订单取值问题导致商品价格设置错误 · bb1e87c3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  bb1e87c3 Browse Files
- 删除调试日志 · 96ce388c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  96ce388c Browse Files
- 填坑 · 51aa9895
  查志伟 committed Nov 01, 2021
  
  51aa9895 Browse Files
- 修改展示价格问题 · 7e810f4b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  7e810f4b Browse Files
- 套餐商品券，商品类型为套餐 · 9037f177
  ping.wu committed Nov 01, 2021
  
  9037f177 Browse Files
- 打个日志看看 · 803867c6
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  803867c6 Browse Files
- 套餐商品券老算价子商品未空问题修复 · 449a51c0
  ping.wu committed Nov 01, 2021
  
  449a51c0 Browse Files
- fix:修复套餐商品->多个数量的情况下,商品计算有问题 · 2f7abd75
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  2f7abd75 Browse Files
- fix:修复套餐商品->多个数量的情况下,商品计算有问题 · ac40254e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 01, 2021
  ac40254e Browse Files
- fix · d3c10b14
  查志伟 committed Nov 01, 2021
  
  d3c10b14 Browse Files
29 Oct, 2021 6 commits
- v3算价标志 · 66cad2f3
  胡敬轩 committed Oct 29, 2021
  
  66cad2f3 Browse Files
- v3算价标志 · 12a31e79
  胡敬轩 committed Oct 29, 2021
  
  12a31e79 Browse Files
- 收银买单退款更新状态报错修复 · f0aad152
  查志伟 committed Oct 29, 2021
  
  f0aad152 Browse Files
- 取消选券的时候, 判断券对应商品是什么 · f3baa4d8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 29, 2021
  f3baa4d8 Browse Files
- 修改订单展示取券名称 · 7730c169
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 29, 2021
  7730c169 Browse Files
- 购物车支持券金额显示 · 991df395
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 29, 2021
  991df395 Browse Files
28 Oct, 2021 5 commits
- 取消支付取消订单 · 546b97aa
  ping.wu committed Oct 28, 2021
  
  546b97aa Browse Files
- 取消支付取消订单 · 1ad722cc
  ping.wu committed Oct 28, 2021
  
  1ad722cc Browse Files
- 取消支付取消订单 · efff0362
  ping.wu committed Oct 28, 2021
  
  efff0362 Browse Files
- 取消支付删除订单 · 8d05e888
  ping.wu committed Oct 28, 2021
  
  8d05e888 Browse Files
- Merge branch 'feature/aplipay-coupon-bowen-1105' into 'master' · f6d924c5
```
Feature/aplipay coupon bowen 1105

See merge request !128
```
  胡博文 committed Oct 28, 2021
  f6d924c5 Browse Files