Commits · b0918a67bb09571204d569d2a05402ca8202e80c · order-group-application / order-group

09 Aug, 2021 8 commits
- 打日志 · b0918a67
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  b0918a67 Browse Files
- 打日志 · 67724050
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  67724050 Browse Files
- 打日志 · 90cf81ce
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  90cf81ce Browse Files
- 打日志 · 04574b54
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  04574b54 Browse Files
- 打日志 · f006ecc1
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  f006ecc1 Browse Files
- 打日志 · a21a40a5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  a21a40a5 Browse Files
- 打日志 · 4bb03b01
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  4bb03b01 Browse Files
- 打日志 · c30270b4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  c30270b4 Browse Files
05 Aug, 2021 2 commits
- sdk新增方法 · 4949e6cb
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 05, 2021
  4949e6cb Browse Files
- 买券商品,设置 productType=9 · 7554383f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 05, 2021
  7554383f Browse Files
29 Jul, 2021 1 commit
- sdk升级 · 6a4f5ff6
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 29, 2021
  6a4f5ff6 Browse Files
28 Jul, 2021 2 commits
- 升级sdk · d7d22be0
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 28, 2021
  d7d22be0 Browse Files
- ordercenter-sdk 新增方法用于B端下载判断商品类型 · 8daf9dcb
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 28, 2021
  8daf9dcb Browse Files
27 Jul, 2021 7 commits
- 返回商品服务查询的数据用于转换购物车商品类型 · 94fb23e7
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 27, 2021
  94fb23e7 Browse Files
- 返回商品服务查询的数据用于转换购物车商品类型 · 117c0466
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 27, 2021
  117c0466 Browse Files
- Merge remote-tracking branch 'origin/master' · 7a0ba454
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  ping.wu committed Jul 27, 2021
  7a0ba454 Browse Files
- Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'master' of… · 48a7c6d1
```
Merge branches 'feature/20210715_购物车可用优惠券改造_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
```
  ping.wu committed Jul 27, 2021
  48a7c6d1 Browse Files
- Merge branch 'feature/20210720-富有对接折扣券新增折扣参数-wsc' · 4d4e9264
  王世昌 committed Jul 27, 2021
  
  4d4e9264 Browse Files
- Merge branches 'feature/20210714_微商城运费到付_wuping' and 'master' of… · b0a51ffd
```
Merge branches 'feature/20210714_微商城运费到付_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 27, 2021
  b0a51ffd Browse Files
- 促销券优惠取couponDiscounts集合 · 3bddb48a
  ping.wu committed Jul 27, 2021
  
  3bddb48a Browse Files
26 Jul, 2021 1 commit
- Merge branches 'feature/20210712_支付宝订单状态推送_wuping' and 'master' of… · 2a4cbdeb
```
Merge branches 'feature/20210712_支付宝订单状态推送_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 26, 2021
  2a4cbdeb Browse Files
22 Jul, 2021 3 commits
- 设置到付，isDispatchFree为空判断 · ba1be733
  ping.wu committed Jul 22, 2021
  
  ba1be733 Browse Files
- 订单信息修改也推送mq · d003c4d8
  ping.wu committed Jul 22, 2021
  
  d003c4d8 Browse Files
- 选中优惠券赋值 · 8410aa4f
  ping.wu committed Jul 22, 2021
  
  8410aa4f Browse Files
21 Jul, 2021 2 commits
- apollo加载namespace加载顺序修改 · f75e1e9e
  ping.wu committed Jul 21, 2021
  
  f75e1e9e Browse Files
- url配置重合修改 · bdc761e3
  ping.wu committed Jul 21, 2021
  
  bdc761e3 Browse Files
20 Jul, 2021 7 commits
- getFlag 为空装换报错修改 · 105ea80b
  ping.wu committed Jul 20, 2021
  
  105ea80b Browse Files
- 聚合层sdk异常，版本引不到，解决代码报错 · c36daef9
  hanghang.wang committed Jul 20, 2021
  
  c36daef9 Browse Files
- 聚合层sdk异常，版本引不到，解决代码报错 · c9fa01d1
  hanghang.wang committed Jul 20, 2021
  
  c9fa01d1 Browse Files
- Merge branches 'feature/20210707_wuping' and… · 2f215f1f
```
Merge branches 'feature/20210707_wuping' and 'feature/20210715_购物车可用优惠券改造_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20210715_购物车可用优惠券改造_wuping

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
```
  ping.wu committed Jul 20, 2021
  2f215f1f Browse Files
- 富有对接折扣券改为使用折扣比计算 · 5b558fcd
  王世昌 committed Jul 20, 2021
  
  5b558fcd Browse Files
- 结算页查询可用优惠券改造 · 87f424a8
  ping.wu committed Jul 20, 2021
  
  87f424a8 Browse Files
- 20210720-富有对接折扣券新增折扣参数 · 582d5f15
  王世昌 committed Jul 20, 2021
  
  582d5f15 Browse Files
19 Jul, 2021 6 commits
- sdk审计，添加小助手日结订单从库查询和审核列表从库查询 · 50bd9f31
  刘继明 committed Jul 19, 2021
  
  50bd9f31 Browse Files
- 微商城运费付款方式 · 688abf9e
  ping.wu committed Jul 19, 2021
  
  688abf9e Browse Files
- Merge branch 'feature/20210714_一元买虚拟商品特殊处理活动下架，删除特殊增加字段_wanghanghang' · 292dfd0b
  hanghang.wang committed Jul 19, 2021
  
  292dfd0b Browse Files
- 去掉多余注释 · 280513ca
  hanghang.wang committed Jul 19, 2021
  
  280513ca Browse Files
- Merge branch 'feature/20210714_一元买虚拟商品特殊处理活动下架，删除特殊增加字段_wanghanghang' · 8d258eb0
  hanghang.wang committed Jul 19, 2021
  
  8d258eb0 Browse Files
- 去掉多余日志 · 251f7f70
  hanghang.wang committed Jul 19, 2021
  
  251f7f70 Browse Files
17 Jul, 2021 1 commit
- 添加日志 · e78a480a
  hanghang.wang committed Jul 17, 2021
  
  e78a480a Browse Files