Commits · f6ef66fbc7c85a87d7057900afffe1cae354c7cb · order-group-application / order-group · GitLab

21 Sep, 2020 13 commits
- fix · f6ef66fb
  xiaoer.li@freemud.com committed Sep 21, 2020
  
  f6ef66fb Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa · 48d07e96
  徐康 committed Sep 21, 2020
  
  48d07e96 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 87200667
  zhiheng.zhang committed Sep 21, 2020
  
  87200667 Browse Files
- 合并代码解决冲突 · 05a76fb3
  zhiheng.zhang committed Sep 21, 2020
  
  05a76fb3 Browse Files
- fix:临时:如果appValue是空字符串,不验证 · b0bfa648
  vega committed Sep 21, 2020
  
  b0bfa648 Browse Files
- 早餐随心配套餐名称 · f9b16929
  徐康 committed Sep 21, 2020
  
  f9b16929 Browse Files
- 校验购物车回退 · 1d286401
  zhiheng.zhang committed Sep 21, 2020
  
  1d286401 Browse Files
- 撤单功能添加value转化 · b1100daa
  zhiheng.zhang committed Sep 21, 2020
  
  b1100daa Browse Files
- Merge branch 'feature/2020/09/07-1.9.38-自主积分新增撤单功能-张志恒' into qa · 3015c484
  zhiheng.zhang committed Sep 21, 2020
  
  3015c484 Browse Files
- 撤单功能添加value转化 · 44c87507
  zhiheng.zhang committed Sep 21, 2020
  
  44c87507 Browse Files
- 混合支付无需校验svc卡余额 · 45bc2e2e
  zhiheng.zhang committed Sep 21, 2020
  
  45bc2e2e Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into qa · 27714691
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.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
```
  zhiheng.zhang committed Sep 21, 2020
  27714691 Browse Files
- 混合支付无需校验svc卡余额 · aa6dbc03
  zhiheng.zhang committed Sep 21, 2020
  
  aa6dbc03 Browse Files
20 Sep, 2020 3 commits
- ordercenter版本更新 · 1dbed585
  zhiheng.zhang committed Sep 20, 2020
  
  1dbed585 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · eb286cdd
  zhiheng.zhang committed Sep 20, 2020
  
  eb286cdd Browse Files
- 取餐码返回mealCodeType · 66376df5
  zhiheng.zhang committed Sep 20, 2020
  
  66376df5 Browse Files
19 Sep, 2020 3 commits
- 取餐码更新位置调整 · 92a6db7c
  zhiheng.zhang committed Sep 19, 2020
  
  92a6db7c Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 60e80b73
  zhiheng.zhang committed Sep 19, 2020
  
  60e80b73 Browse Files
- 取餐码更新位置调整 · 037696dd
  zhiheng.zhang committed Sep 19, 2020
  
  037696dd Browse Files
18 Sep, 2020 13 commits
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa · ec1c17aa
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Sep 18, 2020
  ec1c17aa Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 398e03d4
  zhiheng.zhang committed Sep 18, 2020
  
  398e03d4 Browse Files
- 6位取餐码添加打印日志 · 66ae34f9
  zhiheng.zhang committed Sep 18, 2020
  
  66ae34f9 Browse Files
- 麦咖啡修复餐道优惠价格 · 3fad8041
  徐康 committed Sep 18, 2020
  
  3fad8041 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 22e574d7
  zhiheng.zhang committed Sep 18, 2020
  
  22e574d7 Browse Files
- 6位取餐码添加打印日志 · bc3b0615
  zhiheng.zhang committed Sep 18, 2020
  
  bc3b0615 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 0b34b40c
  zhiheng.zhang committed Sep 18, 2020
  
  0b34b40c Browse Files
- 6位取餐码添加打印日志 · 5af1d1cd
  zhiheng.zhang committed Sep 18, 2020
  
  5af1d1cd Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 4338b23d
  zhiheng.zhang committed Sep 18, 2020
  
  4338b23d Browse Files
- 6位取餐码添加打印日志 · 91cbd893
  zhiheng.zhang committed Sep 18, 2020
  
  91cbd893 Browse Files
- sunyu::fixconflicts::resolve conflicts about merge feature banch to qa · 19a744de
  孙昱 committed Sep 18, 2020
  
  19a744de Browse Files
- sunyu::update::fix bug about check-shoppingcart info · 1c36b24a
  孙昱 committed Sep 18, 2020
  
  1c36b24a 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 8 commits
- Merge remote-tracking branch 'origin/qa' into qa · 0395ad3d
  zhiheng.zhang committed Sep 17, 2020
  
  0395ad3d Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 192627a5
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Sep 17, 2020
  192627a5 Browse Files
- 添加取餐码返回 · 0a345e9d
  zhiheng.zhang committed Sep 17, 2020
  
  0a345e9d Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 0425a192
  孙昱 committed Sep 17, 2020
  
  0425a192 Browse Files
- sunyu::fixbug::fix bug about check productInfo about shoppingCart · d421267d
  孙昱 committed Sep 17, 2020
  
  d421267d Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 3b072ebe
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Sep 17, 2020
  3b072ebe Browse Files
- 删除生态返回缓存重的@type属性 · cb932172
  zhiheng.zhang committed Sep 17, 2020
  
  cb932172 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 67b54287
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Sep 17, 2020
  67b54287 Browse Files