Commits · e96c243b4bc78b6d604f5d90a269beeac3806678 · order-group-application / order-group

16 Nov, 2020 8 commits
- Merge remote-tracking branch 'origin/develop' into develop · e96c243b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
```
  徐康 committed Nov 16, 2020
  e96c243b Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1买3赠1卡_xukang' into develop · 3079ae4c
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
#	order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
```
  徐康 committed Nov 16, 2020
  3079ae4c Browse Files
- settlement extinfo · 648b4003
  徐康 committed Nov 16, 2020
  
  648b4003 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · b33ca399
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 16, 2020
  b33ca399 Browse Files
- coco支付有礼活动 · 004525d2
  刘鹏飞 committed Nov 16, 2020
  
  004525d2 Browse Files
- 和代码 · 5220e7e0
  徐康 committed Nov 16, 2020
  
  5220e7e0 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop · 4df2dabc
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
```
  徐康 committed Nov 16, 2020
  4df2dabc Browse Files
- 付款单号条形码 · 48a6466a
  徐康 committed Nov 16, 2020
  
  48a6466a Browse Files
13 Nov, 2020 3 commits
- 添加集点 · 483d403d
  chongfu.liang committed Nov 13, 2020
  
  483d403d Browse Files
- 添加集点 · 587664fe
  chongfu.liang committed Nov 13, 2020
  
  587664fe Browse Files
- 代码被冲了，重新合入 · 33979dc3
  缪晖 committed Nov 13, 2020
  
  33979dc3 Browse Files
12 Nov, 2020 29 commits
- Merge remote-tracking branch 'origin/feature/20201112_fixbug-getCouponNameByCode_yu.sun' · aa39d0e3
  yu.sun committed Nov 12, 2020
  
  aa39d0e3 Browse Files
- Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' · 8920c151
  徐康 committed Nov 12, 2020
  
  8920c151 Browse Files
- 买3赠一 · d9646b66
  徐康 committed Nov 12, 2020
  
  d9646b66 Browse Files
- sunyu::fixbug::fix bug about getCouponNameByCode · 7ddf01d5
  yu.sun committed Nov 12, 2020
  
  7ddf01d5 Browse Files
- Merge branch 'feature/2.0.5-配送单异常或取消状态，通知pos' · c0493117
  chongfu.liang committed Nov 12, 2020
  
  c0493117 Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · 2148e618
  chongfu.liang committed Nov 12, 2020
  
  2148e618 Browse Files
- 修改key · ab9c4c0f
  chongfu.liang committed Nov 12, 2020
  
  ab9c4c0f Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 5f031f9a
  chongfu.liang committed Nov 12, 2020
  
  5f031f9a Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · c3982ad2
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  chongfu.liang committed Nov 12, 2020
  c3982ad2 Browse Files
- 修改key · 83e715ce
  chongfu.liang committed Nov 12, 2020
  
  83e715ce Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/refundJudgeNull-刘鹏飞' into develop · b8c6416e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	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
```
  刘鹏飞 committed Nov 12, 2020
  b8c6416e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/refundJudgeNull-刘鹏飞' into develop · 480df441
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	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
```
  刘鹏飞 committed Nov 12, 2020
  480df441 Browse Files
- setAfterSalesOrderTimeOutTask如果配置为空返回null · c4be9dca
  刘鹏飞 committed Nov 12, 2020
  
  c4be9dca Browse Files
- 去掉注释 · 75b6f05d
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  75b6f05d Browse Files
- 0元优惠处理 · d61d9f5e
  徐康 committed Nov 12, 2020
  
  d61d9f5e Browse Files
- Merge branch 'feature/2.0.5-储值卡支持推配送费' · 06caa08c
  chongfu.liang committed Nov 12, 2020
  
  06caa08c Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · fa28d816
  zhiheng.zhang committed Nov 12, 2020
  
  fa28d816 Browse Files
- 结局类型冲突 · 5b6b85fc
  zhiheng.zhang committed Nov 12, 2020
  
  5b6b85fc Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · f2a845a7
  zhiheng.zhang committed Nov 12, 2020
  
  f2a845a7 Browse Files
- 修改返回名字 · 24cb6642
  zhiheng.zhang committed Nov 12, 2020
  
  24cb6642 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · db895699
  zhiheng.zhang committed Nov 12, 2020
  
  db895699 Browse Files
- 同意退款添加工具类 · b4b5a739
  zhiheng.zhang committed Nov 12, 2020
  
  b4b5a739 Browse Files
- 下单err更新 · 5adc8e8e
  刘鹏飞 committed Nov 12, 2020
  
  5adc8e8e Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 8f143cab
  zhiheng.zhang committed Nov 12, 2020
  
  8f143cab Browse Files
- 同意退款添加工具类 · b43a848b
  zhiheng.zhang committed Nov 12, 2020
  
  b43a848b Browse Files
- up:关掉支付回调Test轮训 · f0d15b76
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  f0d15b76 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 235e81e8
  chongfu.liang committed Nov 12, 2020
  
  235e81e8 Browse Files
- 注册 · 16b9f042
  chongfu.liang committed Nov 12, 2020
  
  16b9f042 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 9bc35aab
  zhiheng.zhang committed Nov 12, 2020
  
  9bc35aab Browse Files