Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' 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/OrderAdapterServiceImpl.java
	order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java
	shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java