Commits · 7ca1bef40cf8359238a77d725ae219c106a55f2b · order-group-application / order-group

24 Aug, 2021 15 commits
- 升级sdk · 7ca1bef4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 24, 2021
  7ca1bef4 Browse Files
- 升级sdk 使用builder 提供无参构造器 · 1d5b88a7
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 24, 2021
  1d5b88a7 Browse Files
- 升级sdk 使用builder 提供无参构造器 · a22c381a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 24, 2021
  a22c381a Browse Files
- 升级sdk 使用builder 提供无参构造器 · 3e4db615
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 24, 2021
  3e4db615 Browse Files
- Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of… · af83f954
```
Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 24, 2021
  af83f954 Browse Files
- 积分等级参数修改为对象调整 · 013aca58
  ping.wu committed Aug 24, 2021
  
  013aca58 Browse Files
- Merge branch 'feature/20210717-外卖单售后流程优化-wsc' · 6f446918
  王世昌 committed Aug 24, 2021
  
  6f446918 Browse Files
- Merge branches 'feature/20210806_积分商城重构_wuping' and 'master' of… · 8b672e5b
```
Merge branches 'feature/20210806_积分商城重构_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/CouponPromotionService.java
```
  ping.wu committed Aug 24, 2021
  8b672e5b Browse Files
- Merge branches 'feature/20210816_买M赠N券_wuping' and 'master' of… · 92f25048
```
Merge branches 'feature/20210816_买M赠N券_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/ShoppingCartNewServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
```
  ping.wu committed Aug 24, 2021
  92f25048 Browse Files
- 计算金额调整 · 41da7521
  ping.wu committed Aug 24, 2021
  
  41da7521 Browse Files
- 升级sdk 本次合并爱马哥需求代码 · 5d85b30c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 24, 2021
  5d85b30c Browse Files
- Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into master-amg-pre · 309d8d01
  周晓航 committed Aug 24, 2021
  
  309d8d01 Browse Files
- Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of… · cbc1c5e2
```
Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of gitlab.freemud.com:order-group-application/order-group into KA-2.0.41-爱马哥预订单开发-zxh
```
  周晓航 committed Aug 24, 2021
  cbc1c5e2 Browse Files
- 订单完成清空购物车优化 · 6f03854b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 24, 2021
  6f03854b Browse Files
- 返回码修改 · 98af42d6
  ping.wu committed Aug 24, 2021
  
  98af42d6 Browse Files
23 Aug, 2021 3 commits
- 券优惠判断调整 · 2299a71b
  ping.wu committed Aug 23, 2021
  
  2299a71b Browse Files
- 爱马哥预定单biztype=7 · 432e1dcb
  胡敬轩 committed Aug 23, 2021
  
  432e1dcb Browse Files
- sdk升级,爱马哥其他服务有在使用 · 0702805c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 23, 2021
  0702805c Browse Files
21 Aug, 2021 1 commit
- 快递单号 · 5ae7add5
  ping.wu committed Aug 21, 2021
  
  5ae7add5 Browse Files
20 Aug, 2021 6 commits
- 预发布合并爱马哥需求 · 2d8ab46a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 20, 2021
  2d8ab46a Browse Files
- 买m赠n券 · ead5107f
  ping.wu committed Aug 20, 2021
  
  ead5107f Browse Files
- Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into master-amg-pre · 6dda8073
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	ordercenter-sdk/pom.xml
#	pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  周晓航 committed Aug 20, 2021
  6dda8073 Browse Files
- 买m赠n券匹配逻辑修改 · 67a098e1
  ping.wu committed Aug 20, 2021
  
  67a098e1 Browse Files
- 代码调整 · f209db48
  ping.wu committed Aug 20, 2021
  
  f209db48 Browse Files
- 积分商城 · 84a8f528
  ping.wu committed Aug 20, 2021
  
  84a8f528 Browse Files
19 Aug, 2021 7 commits
- 积分商城查数据库 · b5eb1d2d
  ping.wu committed Aug 19, 2021
  
  b5eb1d2d Browse Files
- 预约单按照正常订单的消息推送流程走 · 4e9e2986
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 19, 2021
  4e9e2986 Browse Files
- 新算价接口实际优惠数量给订单 · 36552d8a
  ping.wu committed Aug 19, 2021
  
  36552d8a Browse Files
- 前端结算页小计取消商品类券 · 1b60d5c2
  ping.wu committed Aug 19, 2021
  
  1b60d5c2 Browse Files
- 预约单按照正常订单的消息推送流程走 · 9daae3d2
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 19, 2021
  9daae3d2 Browse Files
- 核销商品券传商品原价 · 10111b44
  ping.wu committed Aug 19, 2021
  
  10111b44 Browse Files
- 记录商品参数的券优惠数量 · 01a23dcb
  ping.wu committed Aug 19, 2021
  
  01a23dcb Browse Files
18 Aug, 2021 8 commits
- 价格赋值 · 50fa5f00
  ping.wu committed Aug 18, 2021
  
  50fa5f00 Browse Files
- 新算价　买m赠n券 · e5dfd1c2
  ping.wu committed Aug 18, 2021
  
  e5dfd1c2 Browse Files
- 买m赠n券 · 2f20d2c2
  ping.wu committed Aug 18, 2021
  
  2f20d2c2 Browse Files
- 买m赠n券 · 3b0a4ba9
  ping.wu committed Aug 18, 2021
  
  3b0a4ba9 Browse Files
- 修改提示语 · 39a53687
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 18, 2021
  39a53687 Browse Files
- 修改提示语 · a10aad26
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 18, 2021
  a10aad26 Browse Files
- Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of… · aadff706
```
Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of gitlab.freemud.com:order-group-application/order-group into KA-2.0.41-爱马哥预订单开发-zxh
```
  周晓航 committed Aug 18, 2021
  aadff706 Browse Files
- 预定单, 门店营业结束之后下单不传递takeMealTime 导致校验失败 · 39bc5e15
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 18, 2021
  39bc5e15 Browse Files