Merge branch '220624_HF' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -114,6 +114,7 @@ public class PayServiceImpl implements PayService {
             studentPaymentRouteOrder.setMerNo(merNo);
             studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
             studentPaymentRouteOrder.setServiceAmount(amount);
+            studentPaymentRouteOrder.setTenantId(tenantId);
             studentPaymentRouteOrder.setCreateTime(date);
             studentPaymentRouteOrder.setUpdateTime(date);
             studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
@@ -161,6 +162,7 @@ public class PayServiceImpl implements PayService {
 	            studentPaymentRouteOrder.setMerNo(merNo);
 	            studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
 	            studentPaymentRouteOrder.setServiceAmount(amount);
+	            studentPaymentRouteOrder.setTenantId(tenantId);
 	            studentPaymentRouteOrder.setCreateTime(date);
 	            studentPaymentRouteOrder.setUpdateTime(date);
 	            studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
@@ -358,6 +360,7 @@ public class PayServiceImpl implements PayService {
     	            studentPaymentRouteOrder.setMerNo(goodsSellReceiptMerNo);
     	            studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
     	            studentPaymentRouteOrder.setServiceAmount(subCashAmount);
+    	            studentPaymentRouteOrder.setTenantId(tenantId);
     	            studentPaymentRouteOrder.setCreateTime(date);
     	            studentPaymentRouteOrder.setUpdateTime(date);
     	            studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
@@ -764,6 +767,7 @@ public class PayServiceImpl implements PayService {
             studentPaymentRouteOrder.setMerNo(routeScaleDto.getMerNo());
             studentPaymentRouteOrder.setSaleAmount(routeScaleDto.getSaleAmount());
             studentPaymentRouteOrder.setServiceAmount(routeScaleDto.getServiceAmount());
+            studentPaymentRouteOrder.setTenantId(hfMerchantConfig.getTenantId());
             RouteOrders.add(studentPaymentRouteOrder);
             routingMerNoSet.add(routeScaleDto.getMerNo());
         }