Commits · c407387fe5ecc366835781388f8d13a407db9ec8 · order-group-application / order-group

13 Dec, 2021 1 commit
- 定时任务 · c407387f
  徐康 committed Dec 13, 2021
  
  c407387f Browse Files
09 Dec, 2021 3 commits
- Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into… · 565c3c83
```
Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款
```
  徐康 committed Dec 09, 2021
  565c3c83 Browse Files
- 到期券自动退款 · b015060e
  徐康 committed Dec 09, 2021
  
  b015060e Browse Files
- 增加备注 · e3cd4612
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 09, 2021
  e3cd4612 Browse Files
08 Dec, 2021 6 commits
- 预留代码设置额外配送费操作 · 20a83277
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 08, 2021
  20a83277 Browse Files
- 合代码 · 2b8855b0
  徐康 committed Dec 08, 2021
  
  2b8855b0 Browse Files
- Merge branch 'master' into feature/xukang_20211201_虚拟订单退款 · 213fc3f1
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  徐康 committed Dec 08, 2021
  213fc3f1 Browse Files
- 合代码 · 0f44790c
  徐康 committed Dec 08, 2021
  
  0f44790c Browse Files
- Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into… · 66296c5c
```
Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/OrderServiceClient.java
```
  徐康 committed Dec 08, 2021
  66296c5c Browse Files
- 虚拟商品退款 · f82791fd
  徐康 committed Dec 08, 2021
  
  f82791fd Browse Files
07 Dec, 2021 12 commits
- Merge branch 'feature/xukang_20211110_野萃山商品券黑白名单问题' · 6cf60c76
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
```
  徐康 committed Dec 07, 2021
  6cf60c76 Browse Files
- 修改判断逻辑 · 8214d470
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 07, 2021
  8214d470 Browse Files
- 修改判断逻辑 · a2b94ff8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 07, 2021
  a2b94ff8 Browse Files
- 修改判断逻辑 · 4e00e149
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 07, 2021
  4e00e149 Browse Files
- Merge branch 'feature-储值卡增加积分配置ID1039801-zxh-20211124' · afa04ae9
  周晓航 committed Dec 07, 2021
  
  afa04ae9 Browse Files
- 修改判断逻辑 · c0337801
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 07, 2021
  c0337801 Browse Files
- Merge branch 'feature-储值卡增加积分配置ID1039801-zxh-20211124' · eb4e4eb0
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
```
  周晓航 committed Dec 07, 2021
  eb4e4eb0 Browse Files
- Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'master' of… · 74e0d9f6
```
Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 07, 2021
  74e0d9f6 Browse Files
- 退款回掉订单已取消，直接返回成功 · f8332607
  ping.wu committed Dec 07, 2021
  
  f8332607 Browse Files
- 新增时区设置 · 8e2cbbce
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 07, 2021
  8e2cbbce Browse Files
- Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'master' of… · 7a64dcfd
```
Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
```
  ping.wu committed Dec 07, 2021
  7a64dcfd Browse Files
- Merge remote-tracking branch 'origin/master' · 5271b87b
  徐光兴 committed Dec 07, 2021
  
  5271b87b Browse Files
06 Dec, 2021 5 commits
- 单规格买一赠一支持多属性赠品区分 · db476196
  查志伟 committed Dec 06, 2021
  
  db476196 Browse Files
- 前置处理会员服务校验以及券作废校验 · c901851a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 06, 2021
  c901851a Browse Files
- Merge branch 'master' into feature-储值卡增加积分配置ID1039801-zxh-20211124 · 3840b5b9
  周晓航 committed Dec 06, 2021
  
  3840b5b9 Browse Files
- 前置处理会员服务校验以及券作废校验 · b3e6f2ac
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 06, 2021
  b3e6f2ac Browse Files
- 订单详情申请按钮校验 · f32e91f7
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 06, 2021
  f32e91f7 Browse Files
03 Dec, 2021 11 commits
- 修复买一赠一多规格多次加不同规格赠品显示问题 · 5fbe8c52
  查志伟 committed Dec 03, 2021
  
  5fbe8c52 Browse Files
- 赠品选属性后保持规格名称显示 · 14764a42
  查志伟 committed Dec 03, 2021
  
  14764a42 Browse Files
- 提交 · bf2c3c4f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  bf2c3c4f Browse Files
- 添加注释维护枚举类 · 75cb697b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  75cb697b Browse Files
- 添加注释维护枚举类 · fcea0267
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  fcea0267 Browse Files
- 添加注释维护枚举类 · 716537ee
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  716537ee Browse Files
- 新增订单基础判断 · ae30af97
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  ae30af97 Browse Files
- 提交对接基础服务api, 退款失败记录补偿日志 · c750c855
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  c750c855 Browse Files
- 提交对接基础服务api, 退款失败记录补偿日志 · 5f8adc4a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  5f8adc4a Browse Files
- 1 · 9c1cd9f4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 03, 2021
  9c1cd9f4 Browse Files
- 买一赠一时，赠品属性和原商品保持一致 · 5d60c9db
  查志伟 committed Dec 03, 2021
  
  5d60c9db Browse Files
02 Dec, 2021 2 commits
- 删除无效代码 · 08b67073
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 02, 2021
  08b67073 Browse Files
- 提交申请退款开发代码 · 29d95d9c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 02, 2021
  29d95d9c Browse Files