Commits · 398e03d45a4a39c7905e437967dd60911a6f2381 · order-group-application / order-group · GitLab

18 Sep, 2020 10 commits
- 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
- 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
17 Sep, 2020 11 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
- 删除生态返回缓存重的@type属性 · 9b354913
  zhiheng.zhang committed Sep 17, 2020
  
  9b354913 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · 1d9bb6e6
  zhiheng.zhang committed Sep 17, 2020
  
  1d9bb6e6 Browse Files
- 取餐码修改缓存中的key · 81187b24
  zhiheng.zhang committed Sep 17, 2020
  
  81187b24 Browse Files
16 Sep, 2020 11 commits
- Merge branch 'feature-yu.sun-20200915-new' into qa · 9af4c6fb
  孙昱 committed Sep 16, 2020
  
  9af4c6fb Browse Files
- sunyu::fixbug::remove redundance code block · 5d29b881
  孙昱 committed Sep 16, 2020
  
  5d29b881 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · de149e46
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Sep 16, 2020
  de149e46 Browse Files
- 取餐码从换从中获取 · 14af8ca7
  zhiheng.zhang committed Sep 16, 2020
  
  14af8ca7 Browse Files
- 取餐码从换从中获取 · 6a0cabba
  zhiheng.zhang committed Sep 16, 2020
  
  6a0cabba Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa · c3096662
  zhiheng.zhang committed Sep 16, 2020
  
  c3096662 Browse Files
- 取餐码代码抽取 · 3f59dab0
  zhiheng.zhang committed Sep 16, 2020
  
  3f59dab0 Browse Files
- 取餐码代码抽取 · 4094c1ba
  zhiheng.zhang committed Sep 16, 2020
  
  4094c1ba Browse Files
- 取餐码代码抽取 · 99245caf
  zhiheng.zhang committed Sep 16, 2020
  
  99245caf Browse Files
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into qa · 7a5e693c
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  vega committed Sep 16, 2020
  7a5e693c Browse Files
- Merge branch 'feature/20200914-1.9.39-支付渠道对接生态-肖家炜' into qa · 6ec76693
  vega committed Sep 16, 2020
  
  6ec76693 Browse Files
15 Sep, 2020 8 commits
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of… · b6d00a8f
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  ping.wu committed Sep 15, 2020
  b6d00a8f Browse Files
- 购物车加入数量限制 · 4259abb4
  ping.wu committed Sep 15, 2020
  
  4259abb4 Browse Files
- sunyu::fix conflicts::resolve conflicts about merge branch · 30ff70d2
  yu.sun committed Sep 15, 2020
  
  30ff70d2 Browse Files
- sunyu::fix conflicts::resolve conflicts about merge branch · 6b4fcb25
  yu.sun committed Sep 15, 2020
  
  6b4fcb25 Browse Files
- sunyu::fix conflicts::resolve conflicts about merge branch · f5783475
  yu.sun committed Sep 15, 2020
  
  f5783475 Browse Files
- sunyu::fix conflicts::resolve conflicts about merge branch · 1b98b1f8
  yu.sun committed Sep 15, 2020
  
  1b98b1f8 Browse Files
- sunyu::update::update about new api checkout productInfo for shoppingCart · 43944a8b
  yu.sun committed Sep 15, 2020
  
  43944a8b Browse Files
- 购物车加入数量限制 · c814fa9f
  ping.wu committed Sep 15, 2020
  
  c814fa9f Browse Files