Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/util/SnUtils.java

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -735,8 +735,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      * 清分账单生成逻辑改为当天第一笔结算后就新建，后面的产生的订单，追加更新
      */
     private OrderSettleResult orderPaymentSettlement(OrderBasicInfo orderBasicInfo) {
-        String appId = "";
-        AdapayMemberAccount adapayMemberAccount = null;
+        // 获取一级运营商appId
+        String appId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId());
+        if (StringUtils.isBlank(appId)) {
+            return null;
+        }
+        // 获取结算账户信息
+        AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(orderBasicInfo.getMerchantId());
+        if (adapayMemberAccount == null) {
+            return null;
+        }
         OrderSettleResult orderSettleResult = null;
         try {
             if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
@@ -1195,7 +1203,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 
     /**
      * 余额支付订单，使用余额分账
-     *
      * @param orderBasicInfo
      * @param adapayMemberAccount
      * @return