Commits · 17dee1719a2f1a906a9b21fa81f1f16f590a8d1c · order-group-application / order-group

13 Sep, 2021 7 commits
- Merge branch 'feature/20210830_礼品卡支付_wuping' · 17dee171
```
# Conflicts:
#	call-back-service/src/main/resources/logback.xml
#	order-application-service/src/main/resources/logback.xml
#	shopping-cart-application-service/src/main/resources/logback.xml
```
  李学兴 committed Sep 13, 2021
  17dee171 Browse Files
- opt@feature/20210830_礼品卡支付_wuping:# conversionWord="exception" · 6bbdb7c8
  李学兴 committed Sep 13, 2021
  
  6bbdb7c8 Browse Files
- Merge branch 'feature/feature/mn-coupon-bowen-0830' · aac66ea7
  胡博文 committed Sep 13, 2021
  
  aac66ea7 Browse Files
- 去掉redis 配置 · baba3b2b
  胡博文 committed Sep 13, 2021
  
  baba3b2b Browse Files
- Merge branch 'feature/feature/mn-coupon-bowen-0830' · 6782d598
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  胡博文 committed Sep 13, 2021
  6782d598 Browse Files
- Merge branch 'feature/20210830_礼品卡支付_wuping' · 1e16ec9b
```
# Conflicts:
#	call-back-service/src/main/resources/logback.xml
#	order-application-service/src/main/resources/logback.xml
#	shopping-cart-application-service/src/main/resources/logback.xml
```
  李学兴 committed Sep 13, 2021
  1e16ec9b Browse Files
- opt@feature/20210830_礼品卡支付_wuping:# 修改日志模板 · b19e10eb
  李学兴 committed Sep 13, 2021
  
  b19e10eb Browse Files
09 Sep, 2021 2 commits

更换标识字段 · d92f3331
胡博文 committed Sep 09, 2021

d92f3331 Browse Files

Merge branches 'feature/20210830_礼品卡支付_wuping' and 'master' of… · 8efc2d18

Merge branches 'feature/20210830_礼品卡支付_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Sep 09, 2021

8efc2d18 Browse Files

08 Sep, 2021 2 commits
- 恢复购物车链接配置 · e69e6e74
  胡博文 committed Sep 08, 2021
  
  e69e6e74 Browse Files
- 修复不能用其他优惠券问题 · 45be6a5c
  胡博文 committed Sep 08, 2021
  
  45be6a5c Browse Files
07 Sep, 2021 4 commits
- Merge branch 'feature/20210901-40分钟延迟任务-wsc' · 473bc653
  王世昌 committed Sep 07, 2021
  
  473bc653 Browse Files
- Merge branches 'feature/20210901_积分商城兑换券校验券有效期_wuping' and 'master' of… · 6f3ddcc5
```
Merge branches 'feature/20210901_积分商城兑换券校验券有效期_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/MemberDiscountServiceImpl.java
```
  ping.wu committed Sep 07, 2021
  6f3ddcc5 Browse Files
- 删除2227测试商户支付信息展示蜜雪冰城的需求 · e44d7cbe
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 07, 2021
  e44d7cbe Browse Files
- 农工商C端订单查询ES时间范围修改 · c2181603
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 07, 2021
  c2181603 Browse Files
06 Sep, 2021 3 commits
- 礼品卡支付判断 · 0f79647d
  ping.wu committed Sep 06, 2021
  
  0f79647d Browse Files
- Merge branch '20210901-bugfix-zhiwei.zha' · db8f2ce1
  查志伟 committed Sep 06, 2021
  
  db8f2ce1 Browse Files
- 修复生产的npe · bae18dec
  查志伟 committed Sep 06, 2021
  
  bae18dec Browse Files
03 Sep, 2021 6 commits
- 虚拟商品设置原始商品类型 · d44a0045
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 03, 2021
  d44a0045 Browse Files
- Merge branch 'pre' · 4c16da4f
  周晓航 committed Sep 03, 2021
  
  4c16da4f Browse Files
- 积分商城兑换券校验 · 5604e2c3
  ping.wu committed Sep 03, 2021
  
  5604e2c3 Browse Files
- 维护sdk-> 我特么也不想维护了 · d0f92504
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 03, 2021
  d0f92504 Browse Files
- 维护sdk-> 我特么也不想维护了 · c2c3f453
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 03, 2021
  c2c3f453 Browse Files
- Merge branch 'KA-20210810-B端下载购物车新增商品类型维护字段' into pre · df418ec3
  周晓航 committed Sep 03, 2021
  
  df418ec3 Browse Files
02 Sep, 2021 5 commits
- Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'master' of… · 43149c49
```
Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Sep 02, 2021
  43149c49 Browse Files
- 会员价商品行总价问题修改 · c5b93adb
  ping.wu committed Sep 02, 2021
  
  c5b93adb Browse Files
- 40分钟延迟 · 621df42b
  王世昌 committed Sep 02, 2021
  
  621df42b Browse Files
- 会员价商品行总价问题修改 · 1b2426ec
  ping.wu committed Sep 02, 2021
  
  1b2426ec Browse Files
- 会员价商品行总价问题修改 · 8639e3f1
  ping.wu committed Sep 02, 2021
  
  8639e3f1 Browse Files
01 Sep, 2021 6 commits
- 删除多余的 · 522099b9
  ping.wu committed Sep 01, 2021
  
  522099b9 Browse Files
- 礼品卡支付调整 · 173233b1
  ping.wu committed Sep 01, 2021
  
  173233b1 Browse Files
- 新增商品类型维护 · 28c431ca
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 01, 2021
  28c431ca Browse Files
- 虚拟商品设置原始商品类型 · aee24646
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 01, 2021
  aee24646 Browse Files
- 券校验 · 1f3a7a22
  ping.wu committed Sep 01, 2021
  
  1f3a7a22 Browse Files
- 修复生产的npe · 2d00bd80
  查志伟 committed Sep 01, 2021
  
  2d00bd80 Browse Files
31 Aug, 2021 5 commits
- 设置小料商品类型 · baa78459
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 31, 2021
  baa78459 Browse Files
- 判断修改 · da6f073d
  ping.wu committed Aug 31, 2021
  
  da6f073d Browse Files
- 设置小料商品类型 · 52fd1718
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 31, 2021
  52fd1718 Browse Files
- 打印日志调整 · cc826ed9
  ping.wu committed Aug 31, 2021
  
  cc826ed9 Browse Files
- 新算价加购限制修复 · 73b5a015
  ping.wu committed Aug 31, 2021
  
  73b5a015 Browse Files