Commits · 6adfdd2d969ed6a82cead2c6600e1ebab0596630 · order-group-application / order-group

15 Nov, 2021 1 commit
- fix 属性均摊价格显示问题 · 6adfdd2d
  查志伟 committed Nov 15, 2021
  
  6adfdd2d Browse Files
04 Nov, 2021 2 commits
- 修复新算价均摊赠品属性未显示问题 · f6e2bd05
  查志伟 committed Nov 04, 2021
  
  f6e2bd05 Browse Files
- 修复新算价多赠品多送问题 · c4f18bc2
  查志伟 committed Nov 04, 2021
  
  c4f18bc2 Browse Files
03 Nov, 2021 2 commits
- 多个赠品金额展示拆分 · 4ed82c8a
  查志伟 committed Nov 03, 2021
  
  4ed82c8a Browse Files
- 修复查询时赠品属性名称不正确的情况 · 59c982fc
  查志伟 committed Nov 03, 2021
  
  59c982fc Browse Files
02 Nov, 2021 2 commits
- merger 冲突 · 072d325d
  查志伟 committed Nov 02, 2021
  
  072d325d Browse Files
- 添加更新赠品属性接口 · c482e803
  查志伟 committed Nov 02, 2021
  
  c482e803 Browse Files
01 Nov, 2021 1 commit
- 购物车赠品缓存改造 · db88828d
  查志伟 committed Nov 01, 2021
  
  db88828d Browse Files
29 Oct, 2021 2 commits
- Merge remote-tracking branch 'origin/master' into 20211028-订单赠品支持选择属性-zhiwei.zha · b11c1ef0
  查志伟 committed Oct 29, 2021
  
  b11c1ef0 Browse Files
- 赠品信息存入缓存 · 5c3a2602
  查志伟 committed Oct 29, 2021
  
  5c3a2602 Browse Files
28 Oct, 2021 7 commits
- 取消支付取消订单 · 546b97aa
  ping.wu committed Oct 28, 2021
  
  546b97aa Browse Files
- 赠品添加属性 · 9c9a10b4
  查志伟 committed Oct 28, 2021
  
  9c9a10b4 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 5 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
- 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 14 commits
- 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
- 新算价参数赋值 · ec070bc3
  ping.wu committed Oct 25, 2021
  
  ec070bc3 Browse Files
- Merge branches 'feature/20211012_腾讯有数生态接口调整_wuping' and 'master' of… · f6789abc
```
Merge branches 'feature/20211012_腾讯有数生态接口调整_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/MicroOpenplatformClient.java
```
  ping.wu committed Oct 25, 2021
  f6789abc Browse Files
- 生态要求更换接口 · 367e7936
  ping.wu committed Oct 25, 2021
  
  367e7936 Browse Files
- Merge branch '【华莱士】【万象+储值卡+支付+会员+订单】华莱士储值卡合规改造-zxh' · 52a502be
  周晓航 committed Oct 25, 2021
  
  52a502be Browse Files
- 生态要求更换接口 · e395b2c4
  ping.wu committed Oct 25, 2021
  
  e395b2c4 Browse Files
- 餐盒费金额问题修改 · 1f513d1d
  ping.wu committed Oct 25, 2021
  
  1f513d1d Browse Files
- Merge branch '20211012-订单商户全程信息不直接查库改造-zhiwei.zha' · b99e29f1
  查志伟 committed Oct 25, 2021
  
  b99e29f1 Browse Files
- 生态要求更换接口 · b5a44877
  ping.wu committed Oct 25, 2021
  
  b5a44877 Browse Files
- productBindingCoupons与inventedParentActivitiesVo字段重复，删除 · ab233a56
  ping.wu committed Oct 25, 2021
  
  ab233a56 Browse Files
- Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of… · 18b9d363
```
Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
```
  ping.wu committed Oct 25, 2021
  18b9d363 Browse Files
- 查询订单餐盒费配置增加外卖和打包带走判断 · 0ad857fa
  ping.wu committed Oct 25, 2021
  
  0ad857fa Browse Files
- Merge branch 'feature/xukang_20201018_双十一冲刺需求' · 15324ba3
  徐康 committed Oct 25, 2021
  
  15324ba3 Browse Files
- 加价购选择虚拟商品券包，订单详情虚拟商品展示券信息 · 71490aa8
  ping.wu committed Oct 25, 2021
  
  71490aa8 Browse Files
24 Oct, 2021 1 commit
- 删除无效日志 · 990f9b8b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 24, 2021
  990f9b8b Browse Files