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

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 12 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
- Merge remote-tracking branch 'remotes/origin/feature/1.9.24_升级订单分发器' into develop · f7971461
  xiaoer.li@freemud.com committed May 27, 2020
  
  f7971461 Browse Files
- call-back-service升级订单分发器 · 873f7e55
  xiaoer.li@freemud.com committed May 27, 2020
  
  873f7e55 Browse Files
26 May, 2020 15 commits
- 修改退配送费逻辑 · 525cfcc6
  haibo.jiang committed May 27, 2020
  
  525cfcc6 Browse Files
- 更改券码sdk预发布地址 · 45bf795f
  shuhu.hou@freemud.cn committed May 26, 2020
  
  45bf795f Browse Files
- sdk同步升级 · f0d18093
  ping.wu committed May 26, 2020
  
  f0d18093 Browse Files
- Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of… · f4fe53dd
```
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed May 26, 2020
  f4fe53dd Browse Files
- 去掉版本号参数必填校验 · afd126bb
  ping.wu committed May 26, 2020
  
  afd126bb Browse Files
- 买券订单创建修改 · 0300aa1b
  ping.wu committed May 26, 2020
  
  0300aa1b Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 79f5b505
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed May 26, 2020
  79f5b505 Browse Files
- 升级聚合订单sdk · 9cd13be2
  shuhu.hou@freemud.cn committed May 26, 2020
  
  9cd13be2 Browse Files
- Merge branch 'feature-2020/5/14-1.9.23-客如云增加查询修改接口-海波' into develop · 4d177452
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
```
  haibo.jiang committed May 26, 2020
  4d177452 Browse Files
- 增加下游编号 · d89ae8c9
  haibo.jiang committed May 26, 2020
  
  d89ae8c9 Browse Files
- 升级聚合订单sdk · ae813a11
  shuhu.hou@freemud.cn committed May 26, 2020
  
  ae813a11 Browse Files
- Merge branch 'feature/20200525_会员价' into develop · 47144c4b
```
# Conflicts:
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed May 26, 2020
  47144c4b Browse Files
- 会员价调试 · 63d5368b
  shuhu.hou@freemud.cn committed May 26, 2020
  
  63d5368b Browse Files
- 聚合SDK升级 · 829c5f53
  雷后领 committed May 26, 2020
  
  829c5f53 Browse Files
- 新增完成时间 · 500f95f0
  雷后领 committed May 26, 2020
  
  500f95f0 Browse Files