Commits · 44e5bcbbafeabb52599e7bd168f04f4a16f511b9 · order-group-application / order-group · GitLab

18 May, 2020 10 commits
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · 44e5bcbb
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
```
  haibo.jiang committed May 18, 2020
  44e5bcbb Browse Files
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · ea7ffa64
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
```
  haibo.jiang committed May 18, 2020
  ea7ffa64 Browse Files
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into qa · d8ba735c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
```
  haibo.jiang committed May 18, 2020
  d8ba735c Browse Files
- 增加订单支付类型 · 9addf12b
  haibo.jiang committed May 18, 2020
  
  9addf12b Browse Files
- Merge branch 'feature/1.9.22-蜜雪预支付-20200430-dingkai' into qa · 31270d93
  dingkai committed May 18, 2020
  
  31270d93 Browse Files
- 序号修复 · 27a4df19
  dingkai committed May 18, 2020
  
  27a4df19 Browse Files
- Merge branch 'feature-2020/5/12-1.9.22-退单增加配送费选项-海波' into qa · 23083073
  haibo.jiang committed May 18, 2020
  
  23083073 Browse Files
- 增加日志 · dba83524
  haibo.jiang committed May 18, 2020
  
  dba83524 Browse Files
- 退单增加配送费逻辑 · 0bd2275d
  haibo.jiang committed May 18, 2020
  
  0bd2275d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' · fd61cca6
  xiaoer.li committed May 18, 2020
  
  fd61cca6 Browse Files
15 May, 2020 12 commits
- Merge branch 'feature/20200513_爱马哥兼容' into qa · 43252ef2
  shuhu.hou@freemud.cn committed May 15, 2020
  
  43252ef2 Browse Files
- 爱马哥非外卖单调用送出，直接完成订单 · e79257c9
  shuhu.hou@freemud.cn committed May 15, 2020
  
  e79257c9 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · f2cd66af
  xiaoer.li committed May 15, 2020
  
  f2cd66af Browse Files
- 商家会处理退款申请，请稍后 · a98771cd
  xiaoer.li committed May 15, 2020
  
  a98771cd Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · 8d924d82
  xiaoer.li committed May 15, 2020
  
  8d924d82 Browse Files
- 商家会处理退款申请，请稍后 · 60410235
  xiaoer.li committed May 15, 2020
  
  60410235 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · 20377bac
  xiaoer.li committed May 15, 2020
  
  20377bac Browse Files
- 正在退款中，稍后金额会原路退回退款状态 · a658d016
  xiaoer.li committed May 15, 2020
  
  a658d016 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20200514_1.9.23_discountActiTips' into qa · 8d571ec1
  胡超 committed May 15, 2020
  
  8d571ec1 Browse Files
- 显示完整的满减活动提示 · 6f6c9fc7
  胡超 committed May 15, 2020
  
  6f6c9fc7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · 0a9b9c4a
  xiaoer.li@freemud.com committed May 15, 2020
  
  0a9b9c4a Browse Files
- 退款中的订单提示统一改成正在退款中，请稍等 · 9bda6fe5
  xiaoer.li@freemud.com committed May 15, 2020
  
  9bda6fe5 Browse Files
14 May, 2020 18 commits
- Merge remote-tracking branch 'origin/qa' into qa · 21422304
  xiaoer.li@freemud.com committed May 14, 2020
  
  21422304 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · 4ca53926
  xiaoer.li@freemud.com committed May 14, 2020
  
  4ca53926 Browse Files
- 重新增加退款相关文字描述 · 588136dc
  xiaoer.li@freemud.com committed May 14, 2020
  
  588136dc Browse Files
- 增加售后阶段 · 191c259c
  姜海波 committed May 14, 2020
  
  191c259c Browse Files
- 增加售后阶段 · b1977401
  姜海波 committed May 14, 2020
  
  b1977401 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/5/7-1.9.22-售后ES查询增加阶段条件-海波' · e6086ea5
  姜海波 committed May 14, 2020
  
  e6086ea5 Browse Files
- Merge branch 'feature/20200513_爱马哥兼容' into qa · a5d01a02
  shuhu.hou@freemud.cn committed May 14, 2020
  
  a5d01a02 Browse Files
- 爱马哥非外卖单调用送出，直接完成订单 · 284c5746
  shuhu.hou@freemud.cn committed May 14, 2020
  
  284c5746 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 331605a8
  xiaoer.li@freemud.com committed May 14, 2020
  
  331605a8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · 9d906a60
  xiaoer.li@freemud.com committed May 14, 2020
  
  9d906a60 Browse Files
- 退款中文案描述 · 4460b7cb
  xiaoer.li@freemud.com committed May 14, 2020
  
  4460b7cb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20200514_1.9.23_payGift' into qa · f45723e9
  胡超 committed May 14, 2020
  
  f45723e9 Browse Files
- 通知支付有礼发放奖励：区分是否是储值卡支付 · d245ad04
  胡超 committed May 14, 2020
  
  d245ad04 Browse Files
- 暂时屏蔽涉及到 refundTips相关的赋值 · 33e748bf
  xiaoer.li@freemud.com committed May 14, 2020
  
  33e748bf Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa · ea55423c
  xiaoer.li@freemud.com committed May 14, 2020
  
  ea55423c Browse Files
- 增加退款提示refundTips · 4658432e
  xiaoer.li@freemud.com committed May 14, 2020
  
  4658432e Browse Files
- Merge branch 'feature/20200513_添加购物车校验库存' into qa · 7574d0df
  shuhu.hou@freemud.cn committed May 14, 2020
  
  7574d0df Browse Files
- 买赠商品添加weight、unit字段fixbug · ad39b11e
  shuhu.hou@freemud.cn committed May 14, 2020
  
  ad39b11e Browse Files