- 06 Jul, 2021 12 commits
-
-
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
ping.wu committed
-
刘继明 committed
-
# Conflicts: # order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java # order-management/src/main/java/cn/freemud/management/enums/OperateType.java # order-management/src/main/java/cn/freemud/management/service/OrderManagerService.java # order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java # order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java # order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java # order-management/src/main/java/cn/freemud/management/service/impl/WaimaiOrderMangerServiceImpl.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OperateType.java
刘继明 committed -
刘继明 committed
-
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 05 Jul, 2021 24 commits
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
王世昌 committed
-
周晓航 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/entities/dto/activity/WechatCouponInfoVo.java
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/enums/OrderAccountType.java # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/UpdateDeliveryInfoByIdRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java # order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java
王世昌 committed -
王世昌 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
王世昌 committed -
王世昌 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: # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java
王世昌 committed -
王世昌 committed
-
王世昌 committed
-
- 02 Jul, 2021 4 commits
-
-
黄兆良 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java # order-management/src/main/java/cn/freemud/management/enums/OperateType.java # order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OperateType.java
刘继明 committed
-
