订单详情补充addressId

完结订单按线路计费参数调整

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderV1Mapper.java

@@ -124,4 +124,15 @@ public interface KwtWaybillOrderV1Mapper extends BaseMapper<KwtWaybillOrderV1> {
     int selectDataByLorderId(@Param("id") String id, @Param("statusList") List<Integer> statusList);
 
     int selectDataByLorderIds(@Param("list") List<Long> longList, @Param("status") Integer status);
+
+    /**
+     * 查询订单
+     * @param orderId 订单id
+     * @param type 类型
+     * @param statusList 状态集
+     * @return 订单信息
+     */
+    Map<String,Object> selectOrderByOrderId(@Param("orderId") Long orderId,
+                                            @Param("type") Integer type,
+                                            @Param("statusList") List<Long> statusList);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticsOrderLineFreightRateDto.java

@@ -15,7 +15,7 @@ public class LogisticsOrderLineFreightRateDto implements Serializable {
     /**
      * 线路id
      */
-    private Long lineFreightRateId;
+    private Long lineFreightId;
 
     /**
      * 数量

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LoadAddressVo.java

@@ -16,7 +16,7 @@ public class LoadAddressVo implements Serializable {
     /**
      * 装货ID
      */
-    private String addressId;
+    private Long addressId;
 
     /**
      * 装货地址

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/UnLoadAddressVo.java

@@ -15,7 +15,7 @@ public class UnLoadAddressVo implements Serializable {
     /**
      * 卸货ID
      */
-    private String addressId;
+    private Long addressId;
 
     /**
      * 卸货地名

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

@@ -259,6 +259,7 @@ public class KwtTransportCommonService {
                             .eq(KwtLogisticsOrderAmount::getDelFlag, 0)
             );
             vo.setLoadAmount(orderAmount != null ? orderAmount.getAmount() : new BigDecimal("0.00"));
+            vo.setAddressId(loadAddress.getId());
             loadAddressList.add(vo);
 
         });
@@ -278,6 +279,7 @@ public class KwtTransportCommonService {
                     .eq(KwtLogisticsOrderAmount::getDelFlag, 0)
             );
             vo.setUnloadAmount(orderAmount != null ? orderAmount.getAmount() : new BigDecimal("0.00"));
+            vo.setAddressId(unloadAddress.getId());
             unloadAddressList.add(vo);
 
         });
@@ -1751,7 +1753,7 @@ public class KwtTransportCommonService {
         Long orderId = logisticsOrder.getId();
         List<LogisticsOrderLineFreightRateDto> lineFreightRate = params.getLineFreightRate();
         lineFreightRate.forEach(dto -> {
-            Long lineFreightRateId = dto.getLineFreightRateId();
+            Long lineFreightRateId = dto.getLineFreightId();
             KwtLogisticsOrderLineFreightRate orderLineFreightRate = lineFreightRateMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderLineFreightRate>()
                     .eq(KwtLogisticsOrderLineFreightRate::getLOrderId, orderId)
                     .eq(KwtLogisticsOrderLineFreightRate::getLineFreightRateId, lineFreightRateId)

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

@@ -3273,11 +3273,12 @@ public class KwtWaybillOrderService {
         statusList.add(CarWaybillEnum.REVOKED.getCode().longValue());
 //        statusList.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode().longValue());
         //趟次
-        Map<String, Object> tripMap = waybillOrderDao.selectOrderByOrderId(Long.parseLong(orderId), 1, statusList);
+        Map<String, Object> tripMap = waybillOrderV1Dao.selectOrderByOrderId(Long.parseLong(orderId), 1, statusList);
+//        Map<String, Object> tripMap = waybillOrderDao.selectOrderByOrderId(Long.parseLong(orderId), 1, statusList);
         tripMap.put("waitDistributionAmount", waitDistributionAmount);
         map.put("trip", tripMap);
         //循环
-        Map<String, Object> loopMap = waybillOrderDao.selectOrderByOrderId(Long.parseLong(orderId), 2, statusList);
+        Map<String, Object> loopMap = waybillOrderV1Dao.selectOrderByOrderId(Long.parseLong(orderId), 2, statusList);
         loopMap.put("waitDistributionAmount", waitDistributionAmount);
         map.put("loop", loopMap);
         return HttpResult.ok(map);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/operateService/KwtManagementLogisticsOrderService.java

@@ -580,6 +580,7 @@ public class KwtManagementLogisticsOrderService {
                     .eq(KwtLogisticsOrderAmount::getDelFlag, 0)
             );
             vo.setLoadAmount(orderAmount != null ? orderAmount.getLoadAmount() : new BigDecimal("0.00"));
+            vo.setAddressId(loadAddress.getId());
             loadAddressList.add(vo);
 
         });
@@ -599,6 +600,7 @@ public class KwtManagementLogisticsOrderService {
                     .eq(KwtLogisticsOrderAmount::getDelFlag, 0)
             );
             vo.setUnloadAmount(orderAmount != null ? orderAmount.getUnloadAmount() : new BigDecimal("0.00"));
+            vo.setAddressId(unloadAddress.getId());
             unloadAddressList.add(vo);
 
         });

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

@@ -468,4 +468,19 @@
             </if>
         </where>
     </select>
+    <select id="selectOrderByOrderId" resultType="java.util.Map">
+        SELECT COUNT(a.id) total,
+        IFNULL(SUM(b.entrust_amount),0) AS amount
+        FROM kwt_waybill_order a
+        left join kwt_waybill_order_subtask b on a.id = b.w_order_id
+        WHERE b.l_order_id = #{orderId}
+        AND a.type = #{type}
+        and a.del_flag = 0
+        <if test="statusList != null and statusList.size() > 0">
+            and a.status not in
+            <foreach collection="statusList" open="(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>