Commits · 1f23d9e527e1ea931cccdc13e6ba53d65202378b · order-group-application / order-group

25 Oct, 2021 10 commits
- Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of… · 1f23d9e5
```
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 25, 2021
  1f23d9e5 Browse Files
- 餐盒费金额问题修改 · 1f513d1d
  ping.wu committed Oct 25, 2021
  
  1f513d1d Browse Files
- Merge branches 'feature/20211012_腾讯有数生态接口调整_wuping' and 'qa' of… · 04178888
```
Merge branches 'feature/20211012_腾讯有数生态接口调整_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 25, 2021
  04178888 Browse Files
- 生态要求更换接口 · b5a44877
  ping.wu committed Oct 25, 2021
  
  b5a44877 Browse Files
- Merge branches 'feature/20211021_加价购支持虚拟商品' and 'qa' of… · 122d4148
```
Merge branches 'feature/20211021_加价购支持虚拟商品' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 25, 2021
  122d4148 Browse Files
- productBindingCoupons与inventedParentActivitiesVo字段重复，删除 · ab233a56
  ping.wu committed Oct 25, 2021
  
  ab233a56 Browse Files
- Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of… · 7bea0eb3
```
Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 25, 2021
  7bea0eb3 Browse Files
- 查询订单餐盒费配置增加外卖和打包带走判断 · 0ad857fa
  ping.wu committed Oct 25, 2021
  
  0ad857fa Browse Files
- Merge branches 'feature/20211021_加价购支持虚拟商品' and 'qa' of… · 0808c08b
```
Merge branches 'feature/20211021_加价购支持虚拟商品' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 25, 2021
  0808c08b Browse Files
- 加价购选择虚拟商品券包，订单详情虚拟商品展示券信息 · 71490aa8
  ping.wu committed Oct 25, 2021
  
  71490aa8 Browse Files
24 Oct, 2021 10 commits

解决冲突 · 9ae0cb2c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
9ae0cb2c Browse Files

Merge branch 'feature/20211021_加价购支持虚拟商品' into qa · 28cc8495

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

committed Oct 24, 2021

28cc8495 Browse Files

删除无效日志 · 990f9b8b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
990f9b8b Browse Files
设置新算价的extinfo 信息 · 2f786c2b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
2f786c2b Browse Files
设置新算价的extinfo 信息 · d970d816
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
d970d816 Browse Files
打日志 · 0bdfb319
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
0bdfb319 Browse Files
修复bug · a5ac0686
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
a5ac0686 Browse Files
添加日志 · bb101e97
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
bb101e97 Browse Files
添加日志 · 94c35e12
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
94c35e12 Browse Files
创建订单新增加价购商品类型传递 · 72e88a35
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Oct 24, 2021
72e88a35 Browse Files

23 Oct, 2021 3 commits
- 订单调用购物车计算虚拟商品-> 设置 · f8f1d198
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 23, 2021
  f8f1d198 Browse Files
- Merge remote-tracking branch 'origin/feature/20211021_加价购支持虚拟商品' into feature/20211021_加价购支持虚拟商品 · afd2e197
  周晓航 committed Oct 23, 2021
  
  afd2e197 Browse Files
- 购物车新增加价购支持虚拟商品开发 · 3ce75ce1
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 23, 2021
  3ce75ce1 Browse Files
22 Oct, 2021 10 commits
- 加价购选择虚拟商品券包，订单完成前可申请退款，完成之后不能申请退款 · 507ea3d6
  ping.wu committed Oct 22, 2021
  
  507ea3d6 Browse Files
- Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of… · 75023918
```
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 22, 2021
  75023918 Browse Files
- 套餐商品券原价格问题修复 · 8eb89d49
  ping.wu committed Oct 22, 2021
  
  8eb89d49 Browse Files
- 代码合并错误修改 · 046ea53e
  ping.wu committed Oct 22, 2021
  
  046ea53e Browse Files
- Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of… · fc53b8aa
```
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 22, 2021
  fc53b8aa Browse Files
- 商品券配置多商品时,原价展示错误修改 · e9e28f6a
  ping.wu committed Oct 22, 2021
  
  e9e28f6a Browse Files
- 删除无用代码 · b157a98e
  ping.wu committed Oct 22, 2021
  
  b157a98e Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · d9b483eb
  查志伟 committed Oct 22, 2021
  
  d9b483eb Browse Files
- Merge branch '20211022-当天未过期券未返回修复-zhiwei.zha' into qa · c71665a2
  查志伟 committed Oct 22, 2021
  
  c71665a2 Browse Files
- 修复未过期的券未返回给前端的问题 · 38bc0a54
  查志伟 committed Oct 22, 2021
  
  38bc0a54 Browse Files
21 Oct, 2021 7 commits
- 加价购买虚拟商品券包 · 17ff2567
  ping.wu committed Oct 21, 2021
  
  17ff2567 Browse Files
- Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of… · ab3a1bf5
```
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 21, 2021
  ab3a1bf5 Browse Files
- 套餐商品券原价展示问题修改 · 841d969f
  ping.wu committed Oct 21, 2021
  
  841d969f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20211120_订单发票金额bug修复_chenbin' into qa · 811c78a5
  陈斌 committed Oct 21, 2021
  
  811c78a5 Browse Files
- update2 · 7fa61d82
  陈斌 committed Oct 21, 2021
  
  7fa61d82 Browse Files
- Merge branch '【盛香亭】【C端】订单明细套餐商品价格计算-zxh' into qa · 7122c0d8
  周晓航 committed Oct 21, 2021
  
  7122c0d8 Browse Files
- 促销反馈的价格是没计算可选搭配的, 所以这里需要加上去, · 65cbd93a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 21, 2021
  65cbd93a Browse Files