Commits · d5f58f558e9a35e5c04c7b461118089a2f28c4ef · order-group-application / order-group

12 Oct, 2021 7 commits
- Merge branch '20211012-云打印sdk升级-zhiwei.zha' into qa · d5f58f55
  查志伟 committed Oct 12, 2021
  
  d5f58f55 Browse Files
- 云打印sdk升级，不直接查询数据库 · 4cd04eea
  查志伟 committed Oct 12, 2021
  
  4cd04eea Browse Files
- Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa · 46150b1c
  周晓航 committed Oct 12, 2021
  
  46150b1c Browse Files
- 新算价支持新增字段 shoppingCartGoodsAmount shoppingCartOriginalGoodsAmount · 7c9d91cf
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 12, 2021
  7c9d91cf Browse Files
- 解决代码合并冲突 · 1cd40c1c
  陈斌 committed Oct 12, 2021
  
  1cd40c1c Browse Files
- update · 2c428293
  陈斌 committed Oct 12, 2021
  
  2c428293 Browse Files
- 订单发票二期 · fda07180
  陈斌 committed Oct 12, 2021
  
  fda07180 Browse Files
11 Oct, 2021 12 commits
- Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' · 083f9b96
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateResponse.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
```
  周晓航 committed Oct 11, 2021
  083f9b96 Browse Files
- Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'master' of… · 8c30c426
```
Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 11, 2021
  8c30c426 Browse Files
- 老优惠状态值转换错误修改 · fa493b42
  ping.wu committed Oct 11, 2021
  
  fa493b42 Browse Files
- Merge branches 'feature/20211011_sdk转换错误修复_wuping' and 'qa' of… · e1dd0c82
```
Merge branches 'feature/20211011_sdk转换错误修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 11, 2021
  e1dd0c82 Browse Files
- 老优惠状态值转换错误修改 · 933549c5
  ping.wu committed Oct 11, 2021
  
  933549c5 Browse Files
- Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'qa' of… · c805f0d1
```
Merge branches 'feature/20210916_积分商城扣积分流程调整_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 11, 2021
  c805f0d1 Browse Files
- 积分商城现金加积分发券失败修改 · 8e946b27
  ping.wu committed Oct 11, 2021
  
  8e946b27 Browse Files
- Merge branch '202110090-修复会员价套餐购物车不展示标签问题-zhiwei.zha' into qa · 8f3cba7f
  查志伟 committed Oct 11, 2021
  
  8f3cba7f Browse Files
- 修复购物车npe · 73f9ee30
  查志伟 committed Oct 11, 2021
  
  73f9ee30 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 5c293212
  周晓航 committed Oct 11, 2021
  
  5c293212 Browse Files
- Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa · ff45c482
  周晓航 committed Oct 11, 2021
  
  ff45c482 Browse Files
- 是否满足配送要求, +上加价购商品金额 · 9596b9f0
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 11, 2021
  9596b9f0 Browse Files
09 Oct, 2021 13 commits
- Merge branch '202110090-修复会员价套餐购物车不展示标签问题-zhiwei.zha' into qa · a7659ead
  查志伟 committed Oct 09, 2021
  
  a7659ead Browse Files
- 修复套餐商品购物车标签展示问题 · c261d0ee
  查志伟 committed Oct 09, 2021
  
  c261d0ee Browse Files
- Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa · c33ed6ad
  周晓航 committed Oct 09, 2021
  
  c33ed6ad Browse Files
- 是否满足配送要求, +上加价购商品金额 · da05f099
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 09, 2021
  da05f099 Browse Files
- Merge branch '20210928-美团POS支持-zhiwei.zha' into qa · ec773d91
  查志伟 committed Oct 09, 2021
  
  ec773d91 Browse Files
- Merge branch 'feature/20210917_抖音买券_wp' into qa · ba82ddae
  查志伟 committed Oct 09, 2021
  
  ba82ddae Browse Files
- 抖音下单0元支持 · e3cf46d0
  查志伟 committed Oct 09, 2021
  
  e3cf46d0 Browse Files
- 美团pos订单需求支持 · aa007249
  查志伟 committed Oct 09, 2021
  
  aa007249 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210927-v2048-拒绝退款文案展示' into qa · 785c5776
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  胡敬轩 committed Oct 09, 2021
  785c5776 Browse Files
- Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa · 9c3b0844
  周晓航 committed Oct 09, 2021
  
  9c3b0844 Browse Files
- 修改商品现价原价的金额显示, · 8ca7a686
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 09, 2021
  8ca7a686 Browse Files
- Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa · 3cd7805b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateResponse.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  周晓航 committed Oct 09, 2021
  3cd7805b Browse Files
- 新增字段区分商品的金额 · 7ad87a4f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Oct 09, 2021
  7ad87a4f Browse Files
08 Oct, 2021 1 commit
- Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'master' of… · 557e4d7f
```
Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 08, 2021
  557e4d7f Browse Files
28 Sep, 2021 5 commits
- 修复打日志时getMethod报NoSuchMethodException · 4ab05d68
  胡敬轩 committed Sep 28, 2021
  
  4ab05d68 Browse Files
- merge 冲突 · 56a15078
  查志伟 committed Sep 28, 2021
  
  56a15078 Browse Files
- Merge branch 'feature/20210917_抖音买券_wp' into qa · c20c0894
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed Sep 28, 2021
  c20c0894 Browse Files
- 优惠添加排序属性 · 2b914adf
  查志伟 committed Sep 28, 2021
  
  2b914adf Browse Files
- 添加枚举 · e915cb5c
  查志伟 committed Sep 28, 2021
  
  e915cb5c Browse Files
27 Sep, 2021 2 commits
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' · 4fa350c7
  周晓航 committed Sep 27, 2021
  
  4fa350c7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' · 1ed62631
  陈斌 committed Sep 27, 2021
  
  1ed62631 Browse Files