Commits · 1a4bf2c3dba42a44b3a873e2978e761cfe1e5e5a · order-group-application / order-group · GitLab

06 Jan, 2021 7 commits
- 去掉重复版本号 · 1a4bf2c3
  hanghang.wang committed Jan 06, 2021
  
  1a4bf2c3 Browse Files
- 修改SDK版本号 · ac501bd4
  hanghang.wang committed Jan 06, 2021
  
  ac501bd4 Browse Files
- Merge branch 'feature/2020-12-14_order-group_wanghanghang' · ab2b8c43
```
# 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
```
  hanghang.wang committed Jan 06, 2021
  ab2b8c43 Browse Files
- 停车场订单添加排序规则 · 484b2204
  zhiheng.zhang committed Jan 06, 2021
  
  484b2204 Browse Files
- Merge remote-tracking branch 'origin/master' · 7e444cf3
  zhiheng.zhang committed Jan 06, 2021
  
  7e444cf3 Browse Files
- Merge branch 'feature/20210103-停车场订单添加排序规则-张志恒' · 61a679e9
  zhiheng.zhang committed Jan 06, 2021
  
  61a679e9 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.05-商品券支持多商品' · 44103311
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li committed Jan 06, 2021
  44103311 Browse Files
05 Jan, 2021 3 commits
- sdk 升级添加商户号 · ebcef393
  zhiheng.zhang committed Jan 05, 2021
  
  ebcef393 Browse Files
- 集点添加商户号 · 44907861
  zhiheng.zhang committed Jan 05, 2021
  
  44907861 Browse Files
- Merge branch 'feature/20201211-集点改造活动三期-张志恒' · cd5e700c
  zhiheng.zhang committed Jan 05, 2021
  
  cd5e700c Browse Files
03 Jan, 2021 1 commit
- es 添加排序规则 · 9ed6a37e
  zhiheng.zhang committed Jan 03, 2021
  
  9ed6a37e Browse Files
31 Dec, 2020 1 commit
- 添加是否是你们店级别 · e123a0bf
  zhiheng.zhang committed Dec 31, 2020
  
  e123a0bf Browse Files
30 Dec, 2020 5 commits
- 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 23 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
- 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
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' · 0296f808
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java
```
  zhiheng.zhang committed Dec 29, 2020
  0296f808 Browse Files
- 卖券订单添加支付渠道 · b20da039
  zhiheng.zhang committed Dec 29, 2020
  
  b20da039 Browse Files
- 卖券订单添加支付渠道 · b5bb3ae0
  zhiheng.zhang committed Dec 29, 2020
  
  b5bb3ae0 Browse Files
- 修改hash模一样时的并发问题 · 316d0986
  chongfu.liang committed Dec 29, 2020
  
  316d0986 Browse Files
- update:延长交易号失效时间 · f52bbeeb
  xiaoer.li@freemud.com committed Dec 29, 2020
  
  f52bbeeb Browse Files