Commits · ef32680c09f3076cb83b5e758ddfd3ffc071a203 · order-group-application / order-group

12 Nov, 2021 1 commit
- fix 野翠山发票查询不到的问题 · ef32680c
  查志伟 committed Nov 12, 2021
  
  ef32680c Browse Files
08 Nov, 2021 1 commit
- fix problem · aaafffb4
  查志伟 committed Nov 08, 2021
  
  aaafffb4 Browse Files
02 Nov, 2021 3 commits
- 订单查询支持查询会员合并前的订单 · b846b325
  查志伟 committed Nov 02, 2021
  
  b846b325 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 2 commits
- v3算价标志 · 66cad2f3
  胡敬轩 committed Oct 29, 2021
  
  66cad2f3 Browse Files
- 收银买单退款更新状态报错修复 · f0aad152
  查志伟 committed Oct 29, 2021
  
  f0aad152 Browse Files
28 Oct, 2021 6 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
- Merge branch 'feature/aplipay-coupon-bowen-1020' into feature/aplipay-coupon-bowen-1105 · 227d3fd7
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  胡博文 committed Oct 28, 2021
  227d3fd7 Browse Files
27 Oct, 2021 3 commits

新增商品原始类型属性字段 · e2cca81f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 27, 2021
e2cca81f Browse Files

Merge branch 'feature/20211021_加价购支持虚拟商品' into prerelease · 1329dcb9

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
#	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/calculate/promotion/AdditionSharingService.java

committed Oct 27, 2021

1329dcb9 Browse Files

Merge branch 'master' into prerelease · 2c94cf73
周晓航 committed Oct 27, 2021

2c94cf73 Browse Files

26 Oct, 2021 7 commits
- Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of… · ef59a209
```
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 26, 2021
  ef59a209 Browse Files
- 订单金额等于餐盒费条件 · aa5238e0
  ping.wu committed Oct 26, 2021
  
  aa5238e0 Browse Files
- Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of… · ad5ae4f1
```
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 26, 2021
  ad5ae4f1 Browse Files
- 支付状态与v2订单基础服务同步 · 58f008e9
  ping.wu committed Oct 26, 2021
  
  58f008e9 Browse Files
- 合并冲突 · 23302d9f
  查志伟 committed Oct 26, 2021
  
  23302d9f Browse Files
- Merge branch '20211012-订单商户全程信息不直接查库改造-zhiwei.zha' into 20211019-无单收银-zhiwei.zha · 3855fc97
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/constant/KgdRedisKeyConstant.java
```
  查志伟 committed Oct 26, 2021
  3855fc97 Browse Files
- Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of… · bc2cf337
```
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 26, 2021
  bc2cf337 Browse Files
25 Oct, 2021 1 commit
- Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of… · 35550cc8
```
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 25, 2021
  35550cc8 Browse Files