Commits · 4b584629592618dcc299f3dde1f357a080be18c1 · order-group-application / order-group · GitLab

05 Sep, 2022 2 commits
- Merge branch 'feature/20220905_创建配送单收货人取值修复_wuping' of… · 4b584629
```
Merge branch 'feature/20220905_创建配送单收货人取值修复_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 05, 2022
  4b584629 Browse Files
- 收货人取值错误修改 · a93a1072
  ping.wu committed Sep 05, 2022
  
  a93a1072 Browse Files
02 Sep, 2022 2 commits
- Merge branch 'feature/zxh/重新对接支付退款响应-20220824' into qa · 2272be7a
  周晓航 committed Sep 02, 2022
  
  2272be7a Browse Files
- 维护有基础服务对接售后单状态的链路 · 5261c948
  周晓航 committed Sep 02, 2022
  
  5261c948 Browse Files
26 Aug, 2022 2 commits
- Merge branch 'feature/zxh/临时券码新增字段对接20220826' into qa · f00de146
  周晓航 committed Aug 26, 2022
  
  f00de146 Browse Files
- 新增支付宝渠道订单核销券的字段维护 · 1bf3c714
  周晓航 committed Aug 26, 2022
  
  1bf3c714 Browse Files
24 Aug, 2022 5 commits
- Merge remote-tracking branch 'origin/qa' into qa · a34e6d93
  ping.wu committed Aug 24, 2022
  
  a34e6d93 Browse Files
- Merge branch 'feature/20220824_后付订单小助手收银无需推支付上报_wuping' of… · c09d0d71
```
Merge branch 'feature/20220824_后付订单小助手收银无需推支付上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 24, 2022
  c09d0d71 Browse Files
- 新对接支付返回响应数据 · 945cab85
  周晓航 committed Aug 24, 2022
  
  945cab85 Browse Files
- 后付订单小助手收银线下支付无须推支付上报 · 58bdfd4e
  ping.wu committed Aug 24, 2022
  
  58bdfd4e Browse Files
- 新对接支付返回响应数据 · d7f4a5b6
  周晓航 committed Aug 24, 2022
  
  d7f4a5b6 Browse Files
22 Aug, 2022 1 commit
- Merge branch 'feature/X-Real-IP' · 6f6916f1
  周晓航 committed Aug 22, 2022
  
  6f6916f1 Browse Files
17 Aug, 2022 1 commit
- Merge branch 'feature/X-Real-IP' into qa · 582f484b
  周晓航 committed Aug 17, 2022
  
  582f484b Browse Files
15 Aug, 2022 2 commits
- Merge branch 'Ka-OMS订单同意退款改造' · ff0088b0
  周晓航 committed Aug 15, 2022
  
  ff0088b0 Browse Files
- 支付接口合规改造 · 70b9dc99
  周晓航 committed Aug 15, 2022
  
  70b9dc99 Browse Files
12 Aug, 2022 2 commits
- Merge branch 'feature/shoppingcart-num-limit' into qa · d92b4142
  周晓航 committed Aug 12, 2022
  
  d92b4142 Browse Files
- 购物车更新数量接口新增最大购买商品数量限制判断 · 03a64f4f
  周晓航 committed Aug 12, 2022
  
  03a64f4f Browse Files
11 Aug, 2022 3 commits
- Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of… · 4372f923
```
Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 11, 2022
  4372f923 Browse Files
- Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of… · 05d66db1
```
Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 11, 2022
  05d66db1 Browse Files
- 支付配置表逻辑迁移非码付，退款不做校验门店支付配置 · 2668325e
  ping.wu committed Aug 11, 2022
  
  2668325e Browse Files
10 Aug, 2022 10 commits
- Merge branch 'feature/X-Real-IP' into 'qa' · 79020fad
```
Update FeignInterceptor.java

See merge request !146
```
  缪晖 committed Aug 10, 2022
  79020fad Browse Files
- Update FeignInterceptor.java · e22e581a
  pass商户管理员 committed Aug 10, 2022
  
  e22e581a Browse Files
- Merge branch 'feature/X-Real-IP' into qa · f7ce1839
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java
```
  pass商户管理员 committed Aug 10, 2022
  f7ce1839 Browse Files
- X-Real-IP feign传递 · 3fac2cd5
  pass商户管理员 committed Aug 10, 2022
  
  3fac2cd5 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 1db90850
  ping.wu committed Aug 10, 2022
  
  1db90850 Browse Files
- Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of… · 8f3b3993
```
Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 10, 2022
  8f3b3993 Browse Files
- isRefundDeliveryFee 退款是否退配送费已在申请退款传到订单基础服务，取订单售后单中退款金额 actualAmount · c3efd2eb
  ping.wu committed Aug 10, 2022
  
  c3efd2eb Browse Files
- Merge branch 'Ka-OMS订单同意退款改造' into qa · 7ad60200
  周晓航 committed Aug 10, 2022
  
  7ad60200 Browse Files
- 优化代付的退款逻辑 · bef245ec
  周晓航 committed Aug 10, 2022
  
  bef245ec Browse Files
- Merge branch 'Ka-OMS订单同意退款改造' into qa · 332248a2
  周晓航 committed Aug 10, 2022
  
  332248a2 Browse Files
09 Aug, 2022 3 commits
- Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of… · 8f286ebe
```
Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 09, 2022
  8f286ebe Browse Files
- Merge branch 'KA-订单MQ功能迁移-zxh' · 5f6b6812
  周晓航 committed Aug 09, 2022
  
  5f6b6812 Browse Files
- Merge branch 'feature/暴露查询虚拟门店接口' · ee32b8ea
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java
```
  查志伟 committed Aug 09, 2022
  ee32b8ea Browse Files
08 Aug, 2022 2 commits
- 【【技术线】OMS订单同意退款删除商户配置的订单状态退款开关校验】 · c547495b
```
https://www.tapd.cn/43862731/prong/stories/view/1143862731001051139
```
  周晓航 committed Aug 08, 2022
  c547495b Browse Files
- bugfix=:老代码判断导致npe · 99a477ad
  周晓航 committed Aug 08, 2022
  
  99a477ad Browse Files
04 Aug, 2022 2 commits
- 提取公共代码,暂无需求开发 · 37cd71e3
  周晓航 committed Aug 04, 2022
  
  37cd71e3 Browse Files
- Merge branch 'feature/暴露查询虚拟门店接口' into qa · 3b5f8785
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java
```
  查志伟 committed Aug 04, 2022
  3b5f8785 Browse Files
03 Aug, 2022 2 commits
- Merge remote-tracking branch 'origin/qa' into qa · f0ed6067
  周晓航 committed Aug 03, 2022
  
  f0ed6067 Browse Files
- Merge branch 'KA-订单MQ功能迁移-zxh' into qa · ef9d8c39
  周晓航 committed Aug 03, 2022
  
  ef9d8c39 Browse Files
02 Aug, 2022 1 commit
- Merge branch 'feature/20220726_提供公共支付查询接口_wuping' of… · 1225ea66
```
Merge branch 'feature/20220726_提供公共支付查询接口_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 02, 2022
  1225ea66 Browse Files