Commits · f68b65785dd09f58fb0b3ab7e9f31a4ce1462f3a · order-group-application / order-group

20 Jan, 2021 3 commits
- 修复代码问题 · f68b6578
  徐康 committed Jan 20, 2021
  
  f68b6578 Browse Files
- 修复问题 · f201589a
  徐康 committed Jan 20, 2021
  
  f201589a Browse Files
- 修改问题 · e65f5c93
  徐康 committed Jan 20, 2021
  
  e65f5c93 Browse Files
19 Jan, 2021 5 commits
- Merge remote-tracking branch 'origin/feature/20200108_xukang_麦咖啡p5v2' into… · 75b15827
```
Merge remote-tracking branch 'origin/feature/20200108_xukang_麦咖啡p5v2' into feature/20200108_xukang_麦咖啡p5v2
```
  徐康 committed Jan 19, 2021
  75b15827 Browse Files
- 种子券号免校验 · 755d48bc
  徐康 committed Jan 19, 2021
  
  755d48bc Browse Files
- 修改问题 · ac8cd7ae
  徐康 committed Jan 19, 2021
  
  ac8cd7ae Browse Files
- 验证发的券的有效性 · b90beb08
  徐康 committed Jan 19, 2021
  
  b90beb08 Browse Files
- 麦咖啡多条优惠购买和使用 · 1d43b0e1
  徐康 committed Jan 19, 2021
  
  1d43b0e1 Browse Files
15 Jan, 2021 2 commits
- 增加是否买券订单字段 · d9e48f75
  徐康 committed Jan 15, 2021
  
  d9e48f75 Browse Files
- 修复bug · 7e5bea14
  徐康 committed Jan 15, 2021
  
  7e5bea14 Browse Files
14 Jan, 2021 2 commits
- 优化发券方法入参 · acbd2336
  徐康 committed Jan 14, 2021
  
  acbd2336 Browse Files
- 麦咖啡p5v2 · 8382c1ab
  徐康 committed Jan 14, 2021
  
  8382c1ab Browse Files
13 Jan, 2021 3 commits
- Merge branch 'feature/20201229_xukang_麦咖啡p5v1' into feature/20200108_xukang_麦咖啡p5v2 · 56ef24e5
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
```
  徐康 committed Jan 13, 2021
  56ef24e5 Browse Files
- 麦咖啡买券发券 · f6c7664e
  徐康 committed Jan 13, 2021
  
  f6c7664e Browse Files
- 删除costdetail生成的商品 · 0483bbd7
  徐康 committed Jan 13, 2021
  
  0483bbd7 Browse Files
12 Jan, 2021 7 commits
- 修复问题 · b11c426b
  徐康 committed Jan 12, 2021
  
  b11c426b Browse Files
- Merge branch 'feature/20210105_新增版本号促销有礼活动_wanghanghang' · d0148e01
  hanghang.wang committed Jan 12, 2021
  
  d0148e01 Browse Files
- Merge branch 'feature/20201231_ID1020975C端购物车日志优化_wanghanghang' · 3c8b195b
  hanghang.wang committed Jan 12, 2021
  
  3c8b195b Browse Files
- bug修复 · 83327e5b
  徐康 committed Jan 12, 2021
  
  83327e5b Browse Files
- 升级SDK · ef21f671
  xiaoer.li committed Jan 12, 2021
  
  ef21f671 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.1.15-pos-prospectiveAmount' · 56e00313
  xiaoer.li committed Jan 12, 2021
  
  56e00313 Browse Files
- 修复bug · 64738aa7
  徐康 committed Jan 12, 2021
  
  64738aa7 Browse Files
11 Jan, 2021 1 commit
- Merge branch 'feature/20210104-新算价优惠券重复计算问题-lcf' · e8ac2bb5
  chongfu.liang committed Jan 11, 2021
  
  e8ac2bb5 Browse Files
08 Jan, 2021 5 commits
- add:类型转换 · 9659ae00
  xiaoer.li@freemud.com committed Jan 08, 2021
  
  9659ae00 Browse Files
- 拉单接口返回：prospectiveAmount · f45c8193
  xiaoer.li@freemud.com committed Jan 08, 2021
  
  f45c8193 Browse Files
- 积分抵扣,优惠信息为空判断 · 60cb0f5a
  chongfu.liang committed Jan 08, 2021
  
  60cb0f5a Browse Files
- 修复bug · 4c8397a6
  徐康 committed Jan 08, 2021
  
  4c8397a6 Browse Files
- 修复bug · f2893314
  徐康 committed Jan 08, 2021
  
  f2893314 Browse Files
07 Jan, 2021 12 commits
- fix · 259e0553
  xiaoer.li committed Jan 07, 2021
  
  259e0553 Browse Files
- Merge remote-tracking branch 'origin/master' · 3a5f54fa
  xiaoer.li@freemud.com committed Jan 07, 2021
  
  3a5f54fa Browse Files
- fix:test · 9e470cc2
  xiaoer.li@freemud.com committed Jan 07, 2021
  
  9e470cc2 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · 4a7ffe93
  yu.sun committed Jan 07, 2021
  
  4a7ffe93 Browse Files
- fix:test · 5a4ac167
  xiaoer.li@freemud.com committed Jan 07, 2021
  
  5a4ac167 Browse Files
- Merge remote-tracking branch 'origin/master' · 7a34aad7
  xiaoer.li@freemud.com committed Jan 07, 2021
  
  7a34aad7 Browse Files
- fix:test · b7b96f30
  xiaoer.li@freemud.com committed Jan 07, 2021
  
  b7b96f30 Browse Files
- 测试类方法修改 · f4aadfbe
  刘鹏飞 committed Jan 07, 2021
  
  f4aadfbe Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · 75e7d5e6
  yu.sun committed Jan 07, 2021
  
  75e7d5e6 Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' · 8cb0244b
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
```
  yu.sun committed Jan 07, 2021
  8cb0244b Browse Files
- fix:test · c863ee83
  xiaoer.li@freemud.com committed Jan 07, 2021
  
  c863ee83 Browse Files
- Merge branch 'feature/20201222_combo券需求_yu.sun' · edbcb7ab
  yu.sun committed Jan 07, 2021
  
  edbcb7ab Browse Files