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

29 Oct, 2020 2 commits

Merge branch 'feature/2.0.4-修改支持的订单类型' into qa · 6d423c9c

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java

committed Oct 29, 2020

6d423c9c Browse Files

创建配送单支持类型改造 · c4c548c9
chongfu.liang committed Oct 29, 2020

c4c548c9 Browse Files

28 Oct, 2020 22 commits
- 促销计算：集点活动 · 04517055
  xiaoer.li@freemud.com committed Oct 28, 2020
  
  04517055 Browse Files
- 合并新的算价 · 8a186322
  xiaoer.li@freemud.com committed Oct 28, 2020
  
  8a186322 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' · b6d5a887
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Oct 28, 2020
  b6d5a887 Browse Files
- 升级sdk · f2328bea
  chongfu.liang committed Oct 28, 2020
  
  f2328bea Browse Files
- Merge branch 'feature/2.0.4-集点改造' · 5185742c
  chongfu.liang committed Oct 28, 2020
  
  5185742c Browse Files
- 改造 · a04b1a79
  chongfu.liang committed Oct 28, 2020
  
  a04b1a79 Browse Files
- Merge branch 'feature/2.0.4-集点改造' · e589cd4a
  chongfu.liang committed Oct 28, 2020
  
  e589cd4a Browse Files
- 改造 · 17f2c468
  chongfu.liang committed Oct 28, 2020
  
  17f2c468 Browse Files
- 升级SDK · ba4383de
  chongfu.liang committed Oct 28, 2020
  
  ba4383de Browse Files
- Merge branch 'feature/2.0.4-集点改造' into qa · 162fc985
  chongfu.liang committed Oct 28, 2020
  
  162fc985 Browse Files
- 放时间戳 · 61f4a9de
  chongfu.liang committed Oct 28, 2020
  
  61f4a9de Browse Files
- 升级sdk · f42dae3d
  徐康 committed Oct 28, 2020
  
  f42dae3d Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4d2c51c6
  徐康 committed Oct 28, 2020
  
  4d2c51c6 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa · 9c6f9963
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  徐康 committed Oct 28, 2020
  9c6f9963 Browse Files
- 保存随单购券的键位 · 5f03c0df
  徐康 committed Oct 28, 2020
  
  5f03c0df Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · e8abd137
  chongfu.liang committed Oct 28, 2020
  
  e8abd137 Browse Files
- 去除 · 25f380f0
  chongfu.liang committed Oct 28, 2020
  
  25f380f0 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3c06d242
  徐康 committed Oct 28, 2020
  
  3c06d242 Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa · ce4ff9c3
  徐康 committed Oct 28, 2020
  
  ce4ff9c3 Browse Files
- 订单多次申请退款 · bdbf40c9
  徐康 committed Oct 28, 2020
  
  bdbf40c9 Browse Files
- Merge branch 'feature/2.0.4-集点改造' into qa · e54380b0
  chongfu.liang committed Oct 28, 2020
  
  e54380b0 Browse Files
- 创建订单时落库 · faac5644
  chongfu.liang committed Oct 28, 2020
  
  faac5644 Browse Files
27 Oct, 2020 16 commits
- Merge branch 'feature/2.0.4-集点改造' into qa · 7a85788a
  chongfu.liang committed Oct 28, 2020
  
  7a85788a Browse Files
- 日志 · a7f62381
  chongfu.liang committed Oct 28, 2020
  
  a7f62381 Browse Files
- 日志 · 83d6ce1d
  chongfu.liang committed Oct 28, 2020
  
  83d6ce1d Browse Files
- Merge branch 'feature/2.0.4-集点改造' into qa · a8a788bc
  chongfu.liang committed Oct 28, 2020
  
  a8a788bc Browse Files
- 参数改造 · 7da3c3a1
  chongfu.liang committed Oct 28, 2020
  
  7da3c3a1 Browse Files
- 参数改造 · 8725bded
  chongfu.liang committed Oct 28, 2020
  
  8725bded Browse Files
- Merge branch 'feature/2.0.4-集点改造' into qa · fad57e2d
  chongfu.liang committed Oct 28, 2020
  
  fad57e2d Browse Files
- 参数改造 · dc423b2e
  chongfu.liang committed Oct 28, 2020
  
  dc423b2e Browse Files
- Merge branch 'feature/2.0.4-集点改造' into qa · 5c5fadea
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  chongfu.liang committed Oct 27, 2020
  5c5fadea Browse Files
- 参数改造 · 95d78360
  chongfu.liang committed Oct 27, 2020
  
  95d78360 Browse Files
- 打日志 · 4108a04a
  chongfu.liang committed Oct 27, 2020
  
  4108a04a Browse Files
- 修改参数 · 63761fa3
  chongfu.liang committed Oct 27, 2020
  
  63761fa3 Browse Files
- 修改参数 · 8d74cce6
  chongfu.liang committed Oct 27, 2020
  
  8d74cce6 Browse Files
- 修改参数 · 1b9eb8be
  chongfu.liang committed Oct 27, 2020
  
  1b9eb8be Browse Files
- Merge branch 'feature/2.0.4-集点改造' into qa · 01b68536
  chongfu.liang committed Oct 27, 2020
  
  01b68536 Browse Files
- 修改参数 · 3f6140e1
  chongfu.liang committed Oct 27, 2020
  
  3f6140e1 Browse Files