Commits · 92f250481ca340d8c10343d90b7a4386bde6801a · order-group-application / order-group

24 Aug, 2021 5 commits

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

committed Aug 24, 2021

92f25048 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

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
20 Aug, 2021 5 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

19 Aug, 2021 6 commits
- 预约单按照正常订单的消息推送流程走 · 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
17 Aug, 2021 12 commits
- 买m赠n券 · 1e10653b
  ping.wu committed Aug 18, 2021
  
  1e10653b Browse Files
- 买M赠N券 · 12c89263
  ping.wu committed Aug 17, 2021
  
  12c89263 Browse Files
- 爱马哥预定单biztype=7 · 74d48c3c
  胡敬轩 committed Aug 17, 2021
  
  74d48c3c Browse Files
- 预定单 C端小程序 queryOrders 列表是否要展示申请退款按钮开发 · 004e9e4a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  004e9e4a Browse Files
- 删除无效日志 · e9a52436
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  e9a52436 Browse Files
- 买m赠n券 · 2e6f613c
  ping.wu committed Aug 17, 2021
  
  2e6f613c Browse Files
- 重新开启门店营业时间校验规则 · 8973cc00
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  8973cc00 Browse Files
- 重新开启门店营业时间校验规则 · 9a591ece
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  9a591ece Browse Files
- 买m赠n券 · ddc64c06
  ping.wu committed Aug 17, 2021
  
  ddc64c06 Browse Files
- 拦截数字转化异常 · d6a31c19
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  d6a31c19 Browse Files
- 拦截数字转化异常 · a1a111fd
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  a1a111fd Browse Files
- 拦截数字转化异常 · 4288f721
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  4288f721 Browse Files
16 Aug, 2021 1 commit
- 修改代码走向无其他逻辑 · e5bbbb47
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  e5bbbb47 Browse Files