Merge remote-tracking branch 'origin/v11.1_plat_acc_config_20240125' into test

performance-web/src/main/java/com/clx/performance/dao/impl/PlatformAccountConfigImpl.java

@@ -61,6 +61,8 @@ public class PlatformAccountConfigImpl extends BaseDaoImpl<PlatformAccountConfig
                 .set(PlatformAccountConfig::getOpenBank, config.getOpenBank())
                 .set(PlatformAccountConfig::getBankCode, config.getBankCode())
                 .set(PlatformAccountConfig::getBankCardNo, config.getBankCardNo())
+                .set(PlatformAccountConfig::getModifiedUserNo, config.getModifiedUserNo())
+                .set(PlatformAccountConfig::getModifiedUserName, config.getModifiedUserName())
         );
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -80,6 +80,10 @@ public class SettlementServiceImpl implements SettlementService {
                         RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE, RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY, message
                 );
                 return;
+            } else {
+                invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+                settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
+                settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
             }
         }