Commits · 7bb054a5b3eed6e6143ed8fb85f7ab6665fdc458 · order-group-application / order-group · GitLab

22 Sep, 2020 4 commits
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop · 7bb054a5
  vega committed Sep 22, 2020
  
  7bb054a5 Browse Files
- 电子风味卡对特殊返回进行展示 · 86bc2ad6
  vega committed Sep 22, 2020
  
  86bc2ad6 Browse Files
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop · 4c06be58
  vega committed Sep 22, 2020
  
  4c06be58 Browse Files
- 电子风味卡对特殊返回进行展示 · 646df96d
  vega committed Sep 22, 2020
  
  646df96d Browse Files
21 Sep, 2020 12 commits
- 删除多余的方法 · 3d1614d3
  zhiheng.zhang committed Sep 21, 2020
  
  3d1614d3 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into develop · 5e6763f5
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Sep 21, 2020
  5e6763f5 Browse Files
- 删除多余的方法 · e7764675
  zhiheng.zhang committed Sep 21, 2020
  
  e7764675 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 4146270e
  徐康 committed Sep 21, 2020
  
  4146270e Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into develop · c9318eab
  徐康 committed Sep 21, 2020
  
  c9318eab Browse Files
- 麦咖啡套餐不能合并商品 · 72d496b2
  徐康 committed Sep 21, 2020
  
  72d496b2 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into develop · 6dff21a9
  zhiheng.zhang committed Sep 21, 2020
  
  6dff21a9 Browse Files
- 混合支付购物车结算svc卡金额小于订单金额 · 0a812b45
  zhiheng.zhang committed Sep 21, 2020
  
  0a812b45 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into develop · d8964dab
  徐康 committed Sep 21, 2020
  
  d8964dab Browse Files
- 早餐随心配套餐名称 · f9b16929
  徐康 committed Sep 21, 2020
  
  f9b16929 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into develop · a1968cf5
  zhiheng.zhang committed Sep 21, 2020
  
  a1968cf5 Browse Files
- 混合支付无需校验svc卡余额 · aa6dbc03
  zhiheng.zhang committed Sep 21, 2020
  
  aa6dbc03 Browse Files
20 Sep, 2020 1 commit
- 取餐码返回mealCodeType · 66376df5
  zhiheng.zhang committed Sep 20, 2020
  
  66376df5 Browse Files
19 Sep, 2020 2 commits
- 取餐码更新位置调整 · 92a6db7c
  zhiheng.zhang committed Sep 19, 2020
  
  92a6db7c Browse Files
- 取餐码更新位置调整 · 037696dd
  zhiheng.zhang committed Sep 19, 2020
  
  037696dd Browse Files
18 Sep, 2020 11 commits
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into develop · e5b964fe
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Sep 18, 2020
  e5b964fe Browse Files
- 6位取餐码添加打印日志 · 66ae34f9
  zhiheng.zhang committed Sep 18, 2020
  
  66ae34f9 Browse Files
- 麦咖啡修复餐道优惠价格 · 3fad8041
  徐康 committed Sep 18, 2020
  
  3fad8041 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · 1022c077
  徐康 committed Sep 18, 2020
  
  1022c077 Browse Files
- 麦咖啡订单信息过滤空键位 · 049cb242
  徐康 committed Sep 18, 2020
  
  049cb242 Browse Files
- 6位取餐码添加打印日志 · bc3b0615
  zhiheng.zhang committed Sep 18, 2020
  
  bc3b0615 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · 74973767
  徐康 committed Sep 18, 2020
  
  74973767 Browse Files
- 满减活动保存tenderId · cf14831f
  徐康 committed Sep 18, 2020
  
  cf14831f Browse Files
- 6位取餐码添加打印日志 · 5af1d1cd
  zhiheng.zhang committed Sep 18, 2020
  
  5af1d1cd Browse Files
- 6位取餐码添加打印日志 · 91cbd893
  zhiheng.zhang committed Sep 18, 2020
  
  91cbd893 Browse Files
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' · 3dc90aa6
```
# Conflicts:
#	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/vo/CreateOrderVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  vega committed Sep 18, 2020
  3dc90aa6 Browse Files
17 Sep, 2020 10 commits
- 添加取餐码返回 · 0a345e9d
  zhiheng.zhang committed Sep 17, 2020
  
  0a345e9d Browse Files
- 删除生态返回缓存重的@type属性 · cb932172
  zhiheng.zhang committed Sep 17, 2020
  
  cb932172 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · c651cc80
  徐康 committed Sep 17, 2020
  
  c651cc80 Browse Files
- listcarts返回上次使用的代金券,满减活动保存tenderId · 01543cda
  徐康 committed Sep 17, 2020
  
  01543cda Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · c6223788
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
```
  徐康 committed Sep 17, 2020
  c6223788 Browse Files
- listcarts返回上次使用的代金券,满减活动保存tenderId · 99ec4506
  徐康 committed Sep 17, 2020
  
  99ec4506 Browse Files
- 删除生态返回缓存重的@type属性 · 9b354913
  zhiheng.zhang committed Sep 17, 2020
  
  9b354913 Browse Files
- Merge branches 'develop' and 'feature/20200915_购物车添加限制数量_wuping' of… · a7fd7fdc
```
Merge branches 'develop' and 'feature/20200915_购物车添加限制数量_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Sep 17, 2020
  a7fd7fdc Browse Files
- 赠送商品限制数量 · 78c83097
  ping.wu committed Sep 17, 2020
  
  78c83097 Browse Files
- 取餐码修改缓存中的key · 81187b24
  zhiheng.zhang committed Sep 17, 2020
  
  81187b24 Browse Files