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