- 14 Sep, 2021 1 commit
-
-
Merge branches 'feature/20210831_积分商城2期现金支付_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.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/adapter/CreateOrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.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/impl/SellCouponOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
ping.wu committed
-
- 13 Sep, 2021 7 commits
-
-
# Conflicts: # call-back-service/src/main/resources/logback.xml # order-application-service/src/main/resources/logback.xml # shopping-cart-application-service/src/main/resources/logback.xml
李学兴 committed -
李学兴 committed
-
胡博文 committed
-
胡博文 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
胡博文 committed -
# Conflicts: # call-back-service/src/main/resources/logback.xml # order-application-service/src/main/resources/logback.xml # shopping-cart-application-service/src/main/resources/logback.xml
李学兴 committed -
李学兴 committed
-
- 10 Sep, 2021 3 commits
- 09 Sep, 2021 3 commits
-
-
胡博文 committed
-
ping.wu committed
-
Merge branches 'feature/20210830_礼品卡支付_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
-
- 08 Sep, 2021 3 commits
- 07 Sep, 2021 8 commits
-
-
ping.wu committed
-
王世昌 committed
-
ping.wu committed
-
ping.wu committed
-
Merge branches 'feature/20210901_积分商城兑换券校验券有效期_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/MemberDiscountServiceImpl.java
ping.wu committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 06 Sep, 2021 11 commits
- 03 Sep, 2021 4 commits
