Commits · bb84858d24ca822173994743732b4bfff9eed1a6 · order-group-application / order-group

01 Jun, 2020 17 commits
- Merge branch 'feature/20200528_1.9.25_集点参数为0不要调会员接口' into 'develop' · bb84858d
```
不等于0时不调会员接口

See merge request !3
```
  梁崇福 committed Jun 01, 2020
  bb84858d Browse Files
- 不等于0时不调会员接口 · 076e6bb1
  chongfu.liang committed Jun 01, 2020
  
  076e6bb1 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · cf355805
  chongfu.liang committed Jun 01, 2020
  
  cf355805 Browse Files
- 升级 assortment-shoppingcart-sdk SDK · 53ddb402
  chongfu.liang committed Jun 01, 2020
  
  53ddb402 Browse Files
- Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of… · c208e893
```
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  ping.wu committed Jun 01, 2020
  c208e893 Browse Files
- 升级SDK · f0c0d39e
  chongfu.liang committed Jun 01, 2020
  
  f0c0d39e Browse Files
- 订单商品ext字段对象调整 · f2d4ac07
  ping.wu committed Jun 01, 2020
  
  f2d4ac07 Browse Files
- Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' into develop · ec11885c
  chongfu.liang committed Jun 01, 2020
  
  ec11885c Browse Files
- 订单对接券码字段修改 · 0255120c
  chongfu.liang committed Jun 01, 2020
  
  0255120c Browse Files
- sdk升级 · 48c2f39d
  ping.wu committed Jun 01, 2020
  
  48c2f39d Browse Files
- Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of… · 33a45350
```
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	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/response/order/QueryOrdersResponse.java
```
  ping.wu committed Jun 01, 2020
  33a45350 Browse Files
- 订单优惠信息 · cc861ca2
  ping.wu committed Jun 01, 2020
  
  cc861ca2 Browse Files
- Merge branch 'feature/20200525_会员价' into develop · 28ef5982
  shuhu.hou@freemud.cn committed Jun 01, 2020
  
  28ef5982 Browse Files
- 修复空指针问题 · 748d26ae
  shuhu.hou@freemud.cn committed Jun 01, 2020
  
  748d26ae Browse Files
- sdk升级 · 1ce3e2e7
  ping.wu committed Jun 01, 2020
  
  1ce3e2e7 Browse Files
- Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of… · 0d9ee272
```
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Jun 01, 2020
  0d9ee272 Browse Files
- 订单列表新增bizTypes集合查询卖券订单 · d8e1067c
  ping.wu committed Jun 01, 2020
  
  d8e1067c Browse Files
29 May, 2020 4 commits
- Merge branch 'feature/20200525_会员价' into develop · e1b4f4bc
  shuhu.hou@freemud.cn committed May 29, 2020
  
  e1b4f4bc Browse Files
- 会员价优惠设置划线价 · 8704bf5a
  shuhu.hou@freemud.cn committed May 29, 2020
  
  8704bf5a Browse Files
- 升级SDK · d6b68734
  chongfu.liang committed May 29, 2020
  
  d6b68734 Browse Files
- Merge branch 'feature/20200528_1.9.25_查询非码微店订单，下载' into 'develop' · 354554e2
```
查询非码微店订单，下载

See merge request !1
```
  梁崇福 committed May 29, 2020
  354554e2 Browse Files
28 May, 2020 9 commits
- 订单sdk同步升级 · 9cf65877
  ping.wu committed May 28, 2020
  
  9cf65877 Browse Files
- 买券下单支付成功调整 · eb9554d4
  ping.wu committed May 28, 2020
  
  eb9554d4 Browse Files
- 买券下单支付成功调整 · 0f1eacff
  ping.wu committed May 28, 2020
  
  0f1eacff Browse Files
- 买券下单支付成功调整 · b5dbad42
  ping.wu committed May 28, 2020
  
  b5dbad42 Browse Files
- 查询非码微店订单，下载 · 34d77595
  chongfu.liang committed May 28, 2020
  
  34d77595 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.25_满减提示语' into develop · e58f065c
  xiaoer.li@freemud.com committed May 28, 2020
  
  e58f065c Browse Files
- 增加满减提示list · 245c3559
  xiaoer.li@freemud.com committed May 28, 2020
  
  245c3559 Browse Files
- 会员价优惠取spu级别的优惠 · 040b3041
  shuhu.hou@freemud.cn committed May 28, 2020
  
  040b3041 Browse Files
- structure-center-sdk pom · 54cdeada
  xiaoer.li@freemud.com committed May 28, 2020
  
  54cdeada Browse Files
27 May, 2020 10 commits
- dev 分支只记录 SNAPshot · 60a44f8f
  xiaoer.li@freemud.com committed May 27, 2020
  
  60a44f8f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/19.24_买一赠一活动优化' into develop · 2951b24e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  xiaoer.li@freemud.com committed May 27, 2020
  2951b24e Browse Files
- 买赠商品需要获取商品重量unit、weight数据 · ab59cc5e
  xiaoer.li@freemud.com committed May 27, 2020
  
  ab59cc5e Browse Files
- 修改订单详情配送时间字段 · 5a8acb58
  xiang.ru committed May 27, 2020
  
  5a8acb58 Browse Files
- Merge branch 'feature/20200429客如云查询订单详情增加返回字段-rux' into develop · 822037ae
```
# Conflicts:
#	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/response/order/QueryOrdersResponse.java
```
  xiang.ru committed May 27, 2020
  822037ae Browse Files
- 客如云字段修改 · a80bf59e
  xiang.ru committed May 27, 2020
  
  a80bf59e Browse Files
- SDK 升级 · d724913d
  雷后领 committed May 27, 2020
  
  d724913d Browse Files
- SDK 升级 · d6b1093a
  雷后领 committed May 27, 2020
  
  d6b1093a Browse Files
- 赠品数量取促销返回 · 14d0d29a
  xiaoer.li@freemud.com committed May 27, 2020
  
  14d0d29a Browse Files
- 新增完成时间戳 · 5a783d7a
  雷后领 committed May 27, 2020
  
  5a783d7a Browse Files