Commits · 18414b25c507a7f643e81a6b625d08bb49133f25 · order-group-application / order-group

09 Nov, 2020 9 commits
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · 18414b25
  chongfu.liang committed Nov 09, 2020
  
  18414b25 Browse Files
- 添加农工商卖券 · d4b4fc33
  chongfu.liang committed Nov 09, 2020
  
  d4b4fc33 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into develop · 2ff85b15
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 09, 2020
  2ff85b15 Browse Files
- 集点活动合并代码到dev · edd27d28
  刘鹏飞 committed Nov 09, 2020
  
  edd27d28 Browse Files
- 升级assortment-ordercenter-sdk版本号为2.0.23-SNAPSHOT · 8ae0edb9
  刘鹏飞 committed Nov 09, 2020
  
  8ae0edb9 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop · 884237d1
```
# Conflicts:
#	order-management/pom.xml
```
  徐康 committed Nov 09, 2020
  884237d1 Browse Files
- 入机失败原因 · b6213201
  徐康 committed Nov 09, 2020
  
  b6213201 Browse Files
- 入机失败原因 · 130a6402
  徐康 committed Nov 09, 2020
  
  130a6402 Browse Files
- 下单查询购物车增加集点活动返回 · e79a46dd
  刘鹏飞 committed Nov 09, 2020
  
  e79a46dd Browse Files
05 Nov, 2020 4 commits
- 券校验 · 819e070a
  徐康 committed Nov 05, 2020
  
  819e070a Browse Files
- Merge branch 'feature-yu.sun-checkCartInfoAboutCoupon-20201105' into develop · 219ee959
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  yu.sun committed Nov 05, 2020
  219ee959 Browse Files
- sunyu::update::update assortment-shoppingcart-sdk · 3c091dcb
  yu.sun committed Nov 05, 2020
  
  3c091dcb Browse Files
- sunyu::update::checkout cartInfo about coupon disable · 3bb6eb3f
  yu.sun committed Nov 05, 2020
  
  3bb6eb3f Browse Files
04 Nov, 2020 18 commits
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop · 6cc39651
  徐康 committed Nov 04, 2020
  
  6cc39651 Browse Files
- 设置订单完成时间 · d471b8b9
  徐康 committed Nov 04, 2020
  
  d471b8b9 Browse Files
- 拼单购物车分支合并 · 89ef8d1d
  刘鹏飞 committed Nov 04, 2020
  
  89ef8d1d Browse Files
- Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into… · 5f7e2c97
```
Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into feature/2.0.1-collageOrder-刘鹏飞
```
  刘鹏飞 committed Nov 04, 2020
  5f7e2c97 Browse Files
- 拼单购物车增加购物车版本查询 · 3273bf01
  刘鹏飞 committed Nov 04, 2020
  
  3273bf01 Browse Files
- 升级sdk · 6ab2019c
  徐康 committed Nov 04, 2020
  
  6ab2019c Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop · a7812c6a
```
# 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
```
  徐康 committed Nov 04, 2020
  a7812c6a Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 3d060c67
  徐康 committed Nov 04, 2020
  
  3d060c67 Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 5060d916
  徐康 committed Nov 04, 2020
  
  5060d916 Browse Files
- dev分支sdk版本号对其 · fdcab9e7
  缪晖 committed Nov 04, 2020
  
  fdcab9e7 Browse Files
- 升级sdk · 614a57aa
  chongfu.liang committed Nov 04, 2020
  
  614a57aa Browse Files
- 升级sdk · 58f2c96b
  chongfu.liang committed Nov 04, 2020
  
  58f2c96b Browse Files
- 拼单 · 697e6968
  chongfu.liang committed Nov 04, 2020
  
  697e6968 Browse Files
- Update OrderSdkAdapter.java · 7b917d06
  缪晖 committed Nov 04, 2020
  
  7b917d06 Browse Files
- Update OrderSdkAdapter.java · b75a8bd1
  缪晖 committed Nov 04, 2020
  
  b75a8bd1 Browse Files
- Update OrderSdkAdapter.java · dfdf9c08
  缪晖 committed Nov 04, 2020
  
  dfdf9c08 Browse Files
- marketingType byte空指针判断 · 6512f931
  缪晖 committed Nov 04, 2020
  
  6512f931 Browse Files
- Merge branch 'feature/2.0.5-储值卡支持推配送费' into develop · e90b6b39
  chongfu.liang committed Nov 04, 2020
  
  e90b6b39 Browse Files
03 Nov, 2020 9 commits

拼单购物车合并 · 0af1f13b
刘鹏飞 committed Nov 04, 2020

0af1f13b Browse Files
assortment-ordercenter-sdk修改版本号为2.0.17-RELEASE · c9fac5bb
刘鹏飞 committed Nov 03, 2020

c9fac5bb Browse Files
Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master · b903b8df
刘鹏飞 committed Nov 03, 2020

b903b8df Browse Files
订单退款时间增加当天时间判断，assortment-ordercenter-sdk修改版本号为2.0.16-RELEASE · 7c89847e
刘鹏飞 committed Nov 03, 2020

7c89847e Browse Files
订单退款时间增加当天时间判断1 · 624070d3
刘鹏飞 committed Nov 03, 2020

624070d3 Browse Files
订单退款时间增加当天时间判断 · 98c23583
刘鹏飞 committed Nov 03, 2020

98c23583 Browse Files
fix 合并 · b4fd94e1
huiyang.chen committed Nov 03, 2020

b4fd94e1 Browse Files

Merge branch 'master' into develop · 6dd43341

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

committed Nov 03, 2020

6dd43341 Browse Files

Merge remote-tracking branch 'origin/master' · 5cf282d9
chongfu.liang committed Nov 03, 2020

5cf282d9 Browse Files