Merge branches 'develop' and 'feature/20200103_支付宝支付下单_wuping' of…

Merge branches 'develop' and 'feature/20200103_支付宝支付下单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -95,8 +95,11 @@ public class OrderSdkAdapter {
         request.setSettlementAmount(requestVO.getAmount());
         //实际支付现金金额，扣除支付自生优惠，单位分
         request.setActualPayAmount(requestVO.getAmount());
-//        request.setOrderClient(StringUtils.isEmpty(requestVO.getSource())? OrderClientType.SAAS.getIndex():getNewOrderClient(requestVO.getSource()));
-        request.setOrderClient(requestVO.getOrderClient().getIndex());
+        if(requestVO.getOrderClient() != null){
+            request.setOrderClient(requestVO.getOrderClient().getIndex());
+        }else {
+            request.setOrderClient(StringUtils.isEmpty(requestVO.getSource())? OrderClientType.SAAS.getIndex():getNewOrderClient(requestVO.getSource()));
+        }
         //订单业务类型 1:普通订单 2:虚拟订单
         request.setBizType(1);
         request.setNote(requestVO.getRemark());