- 10 Dec, 2021 6 commits
- 09 Dec, 2021 25 commits
-
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/UpdateDeliveryInfoByIdRequest.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java # order-application-service/src/main/java/cn/freemud/enums/OrderType.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayType.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
ping.wu committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211202_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
徐康 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
徐康 committed -
Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款
徐康 committed -
徐康 committed
-
徐光兴 committed
-
徐光兴 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211202_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java
ping.wu committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 08 Dec, 2021 9 commits
-
-
ping.wu committed
-
Merge branches 'develop' and 'feature/20211202_订单业务类型改造_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java # order-application-service/src/main/java/cn/freemud/enums/OrderType.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java # order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
徐康 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
徐康 committed -
徐康 committed
-
