Commits · 43a6d2a49b19c0d2ca1c0277b60b65fd7d28daca · order-group-application / order-group

04 Jan, 2021 3 commits
- Merge branch 'feature/20201231_ID1020975C端购物车日志优化_wanghanghang' into develop · 43a6d2a4
  hanghang.wang committed Jan 04, 2021
  
  43a6d2a4 Browse Files
- 新增配送类型 · 73576bf9
  hanghang.wang committed Jan 04, 2021
  
  73576bf9 Browse Files
- 生产日志量进一步优化技术方案-购物车 · ffc5a4d6
  hanghang.wang committed Jan 04, 2021
  
  ffc5a4d6 Browse Files
03 Jan, 2021 4 commits

es 添加排序规则 · 584db97a
zhiheng.zhang committed Jan 03, 2021

584db97a Browse Files

Merge branch 'feature/20210103-停车场订单添加排序规则-张志恒' into develop · 471f2bb0

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml

committed Jan 03, 2021

471f2bb0 Browse Files

es 添加排序规则 · 9ed6a37e
zhiheng.zhang committed Jan 03, 2021

9ed6a37e Browse Files
sdk 升级 · 1a9626fd
zhiheng.zhang committed Jan 03, 2021

1a9626fd Browse Files

31 Dec, 2020 6 commits
- 添加是否是门店级别 · 6a69f918
  zhiheng.zhang committed Dec 31, 2020
  
  6a69f918 Browse Files
- 添加是否是你们店级别 · 707bb09d
  zhiheng.zhang committed Dec 31, 2020
  
  707bb09d Browse Files
- 添加是否是你们店级别 · 3545ea48
  zhiheng.zhang committed Dec 31, 2020
  
  3545ea48 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 3fe7d457
  zhiheng.zhang committed Dec 31, 2020
  
  3fe7d457 Browse Files
- Merge branch 'feature/20201211-集点改造活动三期-张志恒' into develop · be8a4f99
  zhiheng.zhang committed Dec 31, 2020
  
  be8a4f99 Browse Files
- 添加是否是你们店级别 · e123a0bf
  zhiheng.zhang committed Dec 31, 2020
  
  e123a0bf Browse Files
30 Dec, 2020 6 commits
- 拼单付款成功更新拼单购物车状态与清除普通购物车逻辑分离 · 99b086aa
  缪晖 committed Dec 30, 2020
  
  99b086aa Browse Files
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' · 34483329
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  chongfu.liang committed Dec 30, 2020
  34483329 Browse Files
- 升级sdk · b6033d66
  chongfu.liang committed Dec 30, 2020
  
  b6033d66 Browse Files
- Merge branch 'hotfix/20201230_collage_shoppingcart_user_unauthorized_miaohui' into 'master' · ee8ae072
```
查询拼单信息经过mvcAspect将异常抛出降级为错误码返回，减少ERROR级别日志输出

See merge request !103
```
  缪晖 committed Dec 30, 2020
  ee8ae072 Browse Files
- 查询拼单信息经过mvcAspect将异常抛出降级为错误码返回，减少ERROR级别日志输出 · fc1c1b99
  缪晖 committed Dec 30, 2020
  
  fc1c1b99 Browse Files
- 添加空判断 · 0e82acd5
  chongfu.liang committed Dec 30, 2020
  
  0e82acd5 Browse Files
29 Dec, 2020 21 commits
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · 2b807a82
  yu.sun committed Dec 29, 2020
  
  2b807a82 Browse Files
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' · b57d6cdc
  chongfu.liang committed Dec 29, 2020
  
  b57d6cdc Browse Files
- 添加优惠价格 · d0b308fc
  chongfu.liang committed Dec 29, 2020
  
  d0b308fc Browse Files
- sunyu::update::resolve conflicts · 103d9f28
  yu.sun committed Dec 29, 2020
  
  103d9f28 Browse Files
- Merge branch 'feature/20201222_combo券需求_yu.sun' into develop · f4b760f6
```
# 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 Dec 29, 2020
  f4b760f6 Browse Files
- Merge branch 'feature/20201228_可用券信息查询NPE修复_yu.sun' into develop · 6fc3b5fc
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	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/QueryOrderAccountType.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/OrderAccountType.java
```
  yu.sun committed Dec 29, 2020
  6fc3b5fc Browse Files
- Merge branch 'feature/20201222_combo券需求_yu.sun' · b0018feb
  yu.sun committed Dec 29, 2020
  
  b0018feb Browse Files
- Merge branch 'feature/20201228_可用券信息查询NPE修复_yu.sun' · 5d76d814
  yu.sun committed Dec 29, 2020
  
  5d76d814 Browse Files
- Merge remote-tracking branch 'origin/master' · 5cd709d7
  zhiheng.zhang committed Dec 29, 2020
  
  5cd709d7 Browse Files
- 抖音添加支付渠道 · 75549577
  zhiheng.zhang committed Dec 29, 2020
  
  75549577 Browse Files
- testfix · 48e674e5
  chongfu.liang committed Dec 29, 2020
  
  48e674e5 Browse Files
- 可用券接口添加appid · fcb451cf
  chongfu.liang committed Dec 29, 2020
  
  fcb451cf Browse Files
- Merge branch 'revert-4709b0bd' into 'feature/2.0.12-富友线下对接开放平台-lcf' · 35810d72
```
Revert "富友"

See merge request !102
```
  梁崇福 committed Dec 29, 2020
  35810d72 Browse Files
- Revert "富友" · c39d8256
```
This reverts commit 4709b0bd
```
  梁崇福 committed Dec 29, 2020
  c39d8256 Browse Files
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' · e3c05496
```
# Conflicts:
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
```
  chongfu.liang committed Dec 29, 2020
  e3c05496 Browse Files
- 抖音添加支付渠道 · a8d92ecf
  zhiheng.zhang committed Dec 29, 2020
  
  a8d92ecf Browse Files
- 抖音添加支付渠道 · 647468a6
  zhiheng.zhang committed Dec 29, 2020
  
  647468a6 Browse Files
- Merge remote-tracking branch 'origin/master' · 9473c298
  zhiheng.zhang committed Dec 29, 2020
  
  9473c298 Browse Files
- 抖音添加支付渠道 · ef52f431
  zhiheng.zhang committed Dec 29, 2020
  
  ef52f431 Browse Files
- Merge branch 'feature/20201223_用户订单查询促销信息转为payGiftReps_wanghanghang' · cdb1a188
  hanghang.wang committed Dec 29, 2020
  
  cdb1a188 Browse Files
- 抖音添加支付渠道 · 4e8697cd
  zhiheng.zhang committed Dec 29, 2020
  
  4e8697cd Browse Files