Commits · 3bbe19733e2101106870a501596490fdfc4fad65 · order-group-application / order-group · GitLab

26 May, 2022 17 commits
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 3bbe1973
  周晓航 committed May 27, 2022
  
  3bbe1973 Browse Files
- 打日志 · bcb6496b
  周晓航 committed May 27, 2022
  
  bcb6496b Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 65c2135b
  周晓航 committed May 26, 2022
  
  65c2135b Browse Files
- 打日志 · dd7ec333
  周晓航 committed May 26, 2022
  
  dd7ec333 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 0baa26e2
  周晓航 committed May 26, 2022
  
  0baa26e2 Browse Files
- 打日志 · 50dc4685
  周晓航 committed May 26, 2022
  
  50dc4685 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 73fce31b
  周晓航 committed May 26, 2022
  
  73fce31b Browse Files
- 打个日志 · 2784e586
  周晓航 committed May 26, 2022
  
  2784e586 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 075b604c
  周晓航 committed May 26, 2022
  
  075b604c Browse Files
- 当前时间点默认走同享逻辑上线 2022年5月26日17:23:00 · 3529be88
  周晓航 committed May 26, 2022
  
  3529be88 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 2b11ad39
  周晓航 committed May 26, 2022
  
  2b11ad39 Browse Files
- 当前时间点默认走同享逻辑上线 2022年5月26日17:23:00 · f17f2564
  周晓航 committed May 26, 2022
  
  f17f2564 Browse Files
- 临时优化,卡配置互斥的情况导致购物车返回数据不对, · f638ae41
```
解决方案: 先自己重新请求一次购物车
```
  周晓航 committed May 26, 2022
  f638ae41 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 8bc43ac1
  周晓航 committed May 26, 2022
  
  8bc43ac1 Browse Files
- 打个日志 · fdb37cd6
  周晓航 committed May 26, 2022
  
  fdb37cd6 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 4e766730
  周晓航 committed May 26, 2022
  
  4e766730 Browse Files
- 虚拟商品支持储值卡互斥 · 241c4a51
  周晓航 committed May 26, 2022
  
  241c4a51 Browse Files
25 May, 2022 4 commits
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 16a57e17
  周晓航 committed May 25, 2022
  
  16a57e17 Browse Files
- 加价购活动查询新增限制 · 41dc72f6
  周晓航 committed May 25, 2022
  
  41dc72f6 Browse Files
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · 293250fc
  周晓航 committed May 25, 2022
  
  293250fc Browse Files
- 新增配置规则走重量计算, 没配置按照原始逻辑 1kg传值 · d5b87e7b
  周晓航 committed May 25, 2022
  
  d5b87e7b Browse Files
24 May, 2022 1 commit
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into qa · 19ebfffa
  周晓航 committed May 24, 2022
  
  19ebfffa Browse Files
23 May, 2022 4 commits
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · f585a15b
  周晓航 committed May 23, 2022
  
  f585a15b Browse Files
- 修改bug,存在赠品的情况会被计算2次 · d59212aa
  周晓航 committed May 23, 2022
  
  d59212aa Browse Files
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · b2fd85a5
  周晓航 committed May 23, 2022
  
  b2fd85a5 Browse Files
- 修改bug,存在赠品的情况会被计算2次 · a50adbe4
  周晓航 committed May 23, 2022
  
  a50adbe4 Browse Files
19 May, 2022 6 commits
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · d0202fd9
  周晓航 committed May 19, 2022
  
  d0202fd9 Browse Files
- 修改bug · 367adc5c
  周晓航 committed May 19, 2022
  
  367adc5c Browse Files
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · 2462ebdb
  周晓航 committed May 19, 2022
  
  2462ebdb Browse Files
- 修改bug · 19f439d2
  周晓航 committed May 19, 2022
  
  19f439d2 Browse Files
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · 3fc0626b
  周晓航 committed May 19, 2022
  
  3fc0626b Browse Files
- 新增日志打印 · e7dcec99
  周晓航 committed May 19, 2022
  
  e7dcec99 Browse Files
18 May, 2022 2 commits
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · e16e2a5e
  周晓航 committed May 18, 2022
  
  e16e2a5e Browse Files
- 修改需求:传递kg 保留三位小数后续尾数直接舍弃 · 06ad79c7
  周晓航 committed May 18, 2022
  
  06ad79c7 Browse Files
17 May, 2022 6 commits
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · f6911035
  周晓航 committed May 17, 2022
  
  f6911035 Browse Files
- 【订C，获取订单明细商品重量，求和（含套餐），传递给devily/create配送服务，克变成千克，÷1000，保留2位小数】 · 79001388
```
https://www.tapd.cn/43862731/prong/stories/view/1143862731001047524
```
  周晓航 committed May 17, 2022
  79001388 Browse Files
- Merge branch 'master' into qa · 5d5bfcbf
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed May 17, 2022
  5d5bfcbf Browse Files
- Merge branch 'feature/v1.0.14' into qa · f90c8373
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed May 17, 2022
  f90c8373 Browse Files
- merge 冲突 · 455bd194
  查志伟 committed May 17, 2022
  
  455bd194 Browse Files
- merge 冲突 · 4d95f86e
  查志伟 committed May 17, 2022
  
  4d95f86e Browse Files