Merge branch 'refs/heads/v25.5_optimize_20240909' into dev

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -44,7 +44,7 @@ public class OrderGoodsSqlProvider {
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
                     "a.user_no,a.user_name,a.stop_flag,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time,a.vehicle_usage," +
                     " a.platform_freight_quotation_tax_type, a.platform_service_fee_rate, " +
-                    " a.deposit, a.invoice_service_fee_rate, a.settlement_way, a.support_loan ");
+                    " a.deposit, a.invoice_service_fee_rate, a.settlement_way, a.support_loan, a.order_source ");
             FROM("order_goods a");
 
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
@@ -188,7 +188,7 @@ public class OrderGoodsSqlProvider {
                 "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_system_address_id,send_longitude," +
                 "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,receive_system_address_id,goods_name,goods_id,create_time,modified_time," +
                 "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time,settlement_account_period,settlement_way," +
-                "platform_freight_quotation_tax_type, platform_service_fee_rate, deposit, invoice_service_fee_rate) VALUES ");
+                "platform_freight_quotation_tax_type, platform_service_fee_rate, deposit, invoice_service_fee_rate, order_source) VALUES ");
 
         for (int i = 0; i < orderGoodsList.size(); i++) {
             OrderGoods o = orderGoodsList.get(i);
@@ -204,7 +204,8 @@ public class OrderGoodsSqlProvider {
                     .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
                     .append(o.getUserNo()).append("','").append(o.getBatchNumber()).append("','").append(o.getLastArriveReceiveTime()).append("','")
                     .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime()).append("','").append(o.getSettlementAccountPeriod()).append("','").append(o.getSettlementWay()).append("','")
-                    .append(o.getPlatformFreightQuotationTaxType()).append("',").append(o.getPlatformServiceFeeRate()).append(",").append(o.getDeposit()).append(",").append(o.getInvoiceServiceFeeRate())
+                    .append(o.getPlatformFreightQuotationTaxType()).append("',").append(o.getPlatformServiceFeeRate()).append(",").append(o.getDeposit()).append(",").append(o.getInvoiceServiceFeeRate()).append(",")
+                    .append(o.getOrderSource())
                     .append(")");
 
             if (i < orderGoodsList.size() - 1) {
@@ -249,7 +250,7 @@ public class OrderGoodsSqlProvider {
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
                     "a.user_no,a.user_name,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time,a.vehicle_usage," +
                     " a.platform_freight_quotation_tax_type, a.platform_service_fee_rate, " +
-                    " a.deposit, a.invoice_service_fee_rate, a.settlement_way, a.support_loan ");
+                    " a.deposit, a.invoice_service_fee_rate, a.settlement_way, a.support_loan, a.already_load_weight, a.already_transport_weight");
             FROM("order_goods a");
 
             if (Objects.nonNull(id)) {