sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsOrderConsignmentService.java

@@ -1814,7 +1814,7 @@ public class KwtLogisticsOrderConsignmentService {
                     KwtLogisticsOrderAmount orderAmount = new KwtLogisticsOrderAmount();
                     BigDecimal defaultBigDecimal = new BigDecimal("0.00");
                     orderAmount.setLOrderId(orderId);
-                    orderAmount.setLAddressId(addressId);
+                    orderAmount.setLAddressId(loadOrderAddress.getId());
                     orderAmount.setAmount(address.getAmount());
                     orderAmount.setSubcontractAmount(defaultBigDecimal);
                     orderAmount.setEntrustAmount(defaultBigDecimal);
@@ -1886,7 +1886,7 @@ public class KwtLogisticsOrderConsignmentService {
                     KwtLogisticsOrderAmount orderAmount = new KwtLogisticsOrderAmount();
                     BigDecimal defaultBigDecimal = new BigDecimal("0.00");
                     orderAmount.setLOrderId(orderId);
-                    orderAmount.setLAddressId(addressId);
+                    orderAmount.setLAddressId(unloadOrderAddress.getId());
                     orderAmount.setAmount(address.getAmount());
                     orderAmount.setSubcontractAmount(defaultBigDecimal);
                     orderAmount.setEntrustAmount(defaultBigDecimal);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -184,6 +184,7 @@ public class KwtWaybillOrderV1Service {
         // 设置分页参数
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<WaybillOrderSelectVo> list = waybillOrderV1Dao.findListPage(params);
+        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
 
         //用户ID
         List<Long> userIds = list.stream().map(WaybillOrderSelectVo::getCreateBy).toList();
@@ -203,7 +204,8 @@ public class KwtWaybillOrderV1Service {
             //数据处理
             findNdexPageHandle(waybillOrder);
         }
-        return PageHelperUtil.getPageResult(new PageInfo<>(data));
+        pageResult.setList(data);
+        return pageResult;
     }
 
     /**

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderAddressMapper.xml

@@ -50,9 +50,8 @@
                a.detail_address AS loadAddressDetail,
                b.load_amount    AS loadAmount
         FROM kwt_logistics_order_address a
-                 LEFT JOIN kwt_logistics_order_amount b ON a.id = b.l_address_id
+        LEFT JOIN kwt_logistics_order_amount b ON a.id = b.l_address_id AND b.del_flag = 0
         WHERE a.del_flag = 0
-          AND b.del_flag = 0
           AND a.address_type = #{addressType,jdbcType=INTEGER}
           AND a.l_order_id = #{lOrderId}
     </select>