Merge remote-tracking branch…

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -133,6 +133,10 @@ public class CarrierOrderChildDetailVO {
     @Schema(description = "目的地详细地址")
     private String receiveDetailAddress;
 
+
+    @Schema(description = "贸易商名称")
+    private String cooperativeCompaniesName;
+
     @Schema(description = "订单来源")
     private Integer orderSource;
     private String orderSourceMsg;

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -241,4 +241,8 @@ public class OrderGoodsVO {
     @Schema(description="已拉运车数")
     private Integer alreadyTransportTruckAmount;
 
+
+    @ApiModelProperty(value = "贸易商名称")
+    private String cooperativeCompaniesName;
+
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressVO.java

@@ -95,6 +95,9 @@ public class PerformanceProgressVO{
     @Schema(description="挂单吨数")
     private BigDecimal pendingWeight;
 
+    @ApiModelProperty("挂单车数")
+    private Integer pendingTruck;
+
     
     @Schema(description="接单车数")
     private Integer orderedTruckNum;

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -217,4 +217,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     int countTakeByOrderGoodsNo(String orderGoodsNo);
     int countLoadByOrderGoodsNo(String orderGoodsNo);
+
+    Long countNotCancelOrderChild(List<String> cancelOrderGoodsNo);
 }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -108,6 +108,8 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     List<OrderGoods> listAfterCreatedByOrderNo(String orderNo);
 
+    List<OrderGoods> listAllByOrderNo(String orderNo);
+
     void batchUpdateOrderGoodsPaying(List<OrderGoods> updateOrderGoods);
 
     void batchCancelOrderGoodsWeight(List<OrderGoodsCancelWeightDTO> cancelOrderGoodsList);

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

@@ -721,4 +721,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public int countLoadByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.countLoadByOrderGoodsNo(orderGoodsNo);
     }
+
+    @Override
+    public Long countNotCancelOrderChild(List<String> cancelOrderGoodsNo) {
+        LambdaQueryWrapper<OrderChild> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(OrderChild :: getOrderGoodsNo,cancelOrderGoodsNo);
+        queryWrapper.le(OrderChild :: getStatus,OrderChildEnum.Status.COMPLETE.getCode());
+        return baseMapper.selectCount(queryWrapper);
+    }
 }

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

@@ -294,6 +294,15 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         );
     }
 
+
+    @Override
+    public List<OrderGoods> listAllByOrderNo(String orderNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderGoods::getOrderNo, orderNo)
+                .ne(OrderGoods::getOrderGoodsStatus,OrderGoodsStatusEnum.Status.CREATED.getCode())
+                .orderByDesc(OrderGoods :: getPendingOrderTime)
+        );
+    }
+
     @Override
     public void batchUpdateOrderGoodsPaying(List<OrderGoods> updateOrderGoods) {
         baseMapper.batchUpdateOrderGoodsPaying(updateOrderGoods);

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -67,25 +67,24 @@ public class OrderGoodsDtsListener {
 
     public void syncPerformanceProgress(OrderGoods before,OrderGoods after, Integer updateType) {
         boolean isSend = false;
-        if(after.getOrderGoodsStatus() >= OrderGoodsStatusEnum.Status.PAYING.getCode()){
-            if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode())){
-                isSend = true;
-            }
-            if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode())
-            && (!Objects.equals(before.getOrderGoodsStatus(),after.getOrderGoodsStatus())
+        if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode())){
+            isSend = true;
+        }
+        if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode())
+                && (!Objects.equals(before.getOrderGoodsStatus(),after.getOrderGoodsStatus())
                 || !Objects.equals(before.getSeniorLogisticsManagerId(),after.getSeniorLogisticsManagerId())
                 || !Objects.equals(before.getExtractWeight(),after.getExtractWeight())
                 || !Objects.equals(before.getPendingOrderFreight(),after.getPendingOrderFreight())
-            )){
-                isSend = true;
-            }
-            if(isSend){
-                log.info("开始发送同步履约进度表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
-                Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
-                rabbitTemplate.send(SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_EXCHANGE,
-                        SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_ROUTING_KEY, body);
-                log.info("结束发送同步履约进度表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
-            }
+                || !Objects.equals(before.getNeedTruckNum(),after.getNeedTruckNum())
+        )){
+            isSend = true;
+        }
+        if(isSend){
+            log.info("开始发送同步履约进度表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
+            Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
+            rabbitTemplate.send(SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_EXCHANGE,
+                    SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_ROUTING_KEY, body);
+            log.info("结束发送同步履约进度表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
         }
     }
 

performance-web/src/main/java/com/clx/performance/model/PerformanceProgress.java

@@ -97,6 +97,12 @@ public class PerformanceProgress implements HasKey<Integer> {
     @Schema(description="挂单吨数")
     private BigDecimal pendingWeight;
 
+
+    @TableField("pending_truck")
+    @ApiModelProperty("挂单车数")
+    private Integer pendingTruck;
+
+
     @TableField("ordered_truck_num")
     @Schema(description="接单车数")
     private Integer orderedTruckNum;

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

@@ -2591,29 +2591,31 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "序号", "index", 2000));
-        fieldList.add(new ExcelField(1, "运单编号", "childNo", 5000));
-        fieldList.add(new ExcelField(2, "车牌号", "truckNo", 5000));
-        fieldList.add(new ExcelField(3, "运单状态", "status", 5000));
-        fieldList.add(new ExcelField(4, "货单编号", "goodsOrderNo", 5000));
-
-        fieldList.add(new ExcelField(5, "货物名称", "goodsName", 5000));
-        fieldList.add(new ExcelField(6, "司机姓名", "driverName", 5000));
-        fieldList.add(new ExcelField(7, "手机号", "phone", 5000));
-        fieldList.add(new ExcelField(8, "运费单价", "frightPrice", 5000));
-
-        fieldList.add(new ExcelField(9, "装车毛重", "loadRough", 5000));
-        fieldList.add(new ExcelField(10, "装车皮重", "loadTare", 5000));
-        fieldList.add(new ExcelField(11, "装车净重", "loadNet", 5000));
-        fieldList.add(new ExcelField(12, "卸车毛重", "loadRough", 5000));
-        fieldList.add(new ExcelField(13, "卸车皮重", "loadTare", 5000));
-        fieldList.add(new ExcelField(14, "卸车净重", "unloadNet", 5000));
-
-
-        fieldList.add(new ExcelField(15, "接单时间", "payTime", 5000));
-        fieldList.add(new ExcelField(16, "完成时间", "finishTime", 5000));
-        fieldList.add(new ExcelField(17, "磅单审核通过时间", "poundAuditTime", 5000));
-        fieldList.add(new ExcelField(18, "发货地址", "sendAddress", 10000));
-        fieldList.add(new ExcelField(19, "收货地址", "receiveAddress", 10000));
+        fieldList.add(new ExcelField(1, "发货地址", "sendAddress", 10000));
+        fieldList.add(new ExcelField(2, "收货地址", "receiveAddress", 10000));
+
+        fieldList.add(new ExcelField(3, "运单编号", "childNo", 5000));
+        fieldList.add(new ExcelField(4, "车牌号", "truckNo", 5000));
+        fieldList.add(new ExcelField(5, "运单状态", "status", 5000));
+        fieldList.add(new ExcelField(6, "货单编号", "goodsOrderNo", 5000));
+
+        fieldList.add(new ExcelField(7, "货物名称", "goodsName", 5000));
+        fieldList.add(new ExcelField(8, "司机姓名", "driverName", 5000));
+        fieldList.add(new ExcelField(9, "手机号", "phone", 5000));
+        fieldList.add(new ExcelField(10, "运费单价", "frightPrice", 5000));
+
+        fieldList.add(new ExcelField(11, "装车毛重", "loadRough", 5000));
+        fieldList.add(new ExcelField(12, "装车皮重", "loadTare", 5000));
+        fieldList.add(new ExcelField(13, "装车净重", "loadNet", 5000));
+        fieldList.add(new ExcelField(14, "卸车毛重", "loadRough", 5000));
+        fieldList.add(new ExcelField(15, "卸车皮重", "loadTare", 5000));
+        fieldList.add(new ExcelField(16, "卸车净重", "unloadNet", 5000));
+
+
+        fieldList.add(new ExcelField(17, "接单时间", "payTime", 5000));
+        fieldList.add(new ExcelField(18, "完成时间", "finishTime", 5000));
+        fieldList.add(new ExcelField(19, "磅单审核通过时间", "poundAuditTime", 5000));
+
 
         fieldList.add(new ExcelField(20, "订单编号", "orderNo", 10000));
         fieldList.add(new ExcelField(21, "订单来源", "orderSourceMsg", 10000));
@@ -2626,6 +2628,8 @@ public class OrderChildServiceImpl implements OrderChildService {
             List<ExcelData> rowData = new ArrayList<>();
 
             rowData.add(new ExcelData(i+1));
+            rowData.add(new ExcelData(dto.getSendAddress()));
+            rowData.add(new ExcelData(dto.getReceiveAddress()));
             rowData.add(new ExcelData(dto.getChildNo()));
             rowData.add(new ExcelData(dto.getTruckNo()));
             if(Objects.isNull(dto.getStatus())){
@@ -2650,8 +2654,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             rowData.add(new ExcelData(dto.getPayTime()));
             rowData.add(new ExcelData(dto.getFinishTime()));
             rowData.add(new ExcelData(dto.getPoundAuditTime()));
-            rowData.add(new ExcelData(dto.getSendAddress()));
-            rowData.add(new ExcelData(dto.getReceiveAddress()));
+
 
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getOrderSourceMsg(), "-"));
@@ -2736,6 +2739,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         carrierOrderChildDetailVO.setSendDetailAddress(sendAddress.getAddress());
         carrierOrderChildDetailVO.setReceiveDetailAddress(receiveAddress.getAddress());
 
+        Result<FeignOrderInfoVO> result = orderFeign.getOrderInfo(orderChild.getOrderNo());
+        carrierOrderChildDetailVO.setCooperativeCompaniesName(result.getData().getCooperativeCompaniesName());
         return carrierOrderChildDetailVO;
     }
 

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

@@ -21,8 +21,6 @@ import com.clx.performance.dao.*;
 import com.clx.performance.dto.OrderGoodsBindTruckNumDTO;
 import com.clx.performance.dto.OrderGoodsCancelDTO;
 import com.clx.performance.enums.*;
-import com.clx.performance.enums.settle.SettlementOrderChildRiskEnum;
-import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.extranal.user.DriverService;
@@ -49,7 +47,6 @@ import com.clx.performance.vo.pc.DriverFreightPriceVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsPendingVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import com.clx.performance.vo.pc.carrier.settle.SettlementOrderChildRiskVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.feign.UserClxFeign;
 import com.msl.common.base.Optional;
@@ -161,6 +158,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
         orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
         orderGoodsVO.setDispatchedOrders(truckList.size());
+        orderGoodsVO.setCooperativeCompaniesName(orderInfoFeign.getCooperativeCompaniesName());
         return orderGoodsVO;
     }
 

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

@@ -461,7 +461,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
         }
         //根据挂单时间倒序排序
-        List<OrderGoods> orderGoods = orderGoodsDao.listAfterCreatedByOrderNo(data.getOrderNo());
+        List<OrderGoods> orderGoods = orderGoodsDao.listAllByOrderNo(data.getOrderNo());
         if(CollectionUtils.isEmpty(orderGoods)){
             return;
         }
@@ -469,7 +469,13 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         BigDecimal pendingOrderFreight =  null;  //最新的货单的司机运费，取消的也算
         LocalDateTime firstPendingTime = null;  //挂单时间，取消的也算
         BigDecimal pendingWeight = BigDecimal.ZERO;
+        Integer pendingTruck = calcPendingTruck(orderGoods);
         for(OrderGoods item : orderGoods){
+            //只有挂单车数统计所有货单的
+            if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CREATED.getCode())){
+                continue;
+            }
+
             seniorLogisticsManagerNameSet.add(item.getSeniorLogisticsManagerName());
             if(Objects.isNull(pendingOrderFreight)){
                 pendingOrderFreight = item.getPendingOrderFreight();
@@ -486,9 +492,32 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         update.setDriverFreightPrice(pendingOrderFreight);
         update.setPendingTime(firstPendingTime);
         update.setPendingWeight(pendingWeight);
+        update.setPendingTruck(pendingTruck);
         performanceProgressDao.updateEntityByKey(update);
     }
 
+
+    //统计挂单车数
+    public Integer calcPendingTruck(List<OrderGoods> orderGoods){
+        int totalNeedTruck = 0;
+        List<String> completedOrderGoodsNo = new ArrayList<>();
+        for (OrderGoods item : orderGoods) {
+            if(!Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+                if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
+                    completedOrderGoodsNo.add(item.getOrderGoodsNo());
+                }else{
+                    totalNeedTruck = totalNeedTruck + item.getNeedTruckNum();
+                }
+
+            }
+        }
+        if(CollectionUtils.isNotEmpty(completedOrderGoodsNo)){
+            Long count = orderChildDao.countNotCancelOrderChild(completedOrderGoodsNo);
+            totalNeedTruck = totalNeedTruck + count.intValue();
+        }
+        return totalNeedTruck;
+    }
+
     //计算履约进度表货单的挂单吨数
     @Override
     public BigDecimal calcPendingWeight(OrderGoods item){
@@ -627,6 +656,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                     rowData.add(new ExcelData(vo.getTaskWeight()));
                 } else if (item.getCode().equals("pendingWeight")) {
                     rowData.add(new ExcelData(vo.getPendingWeight()));
+                }else if (item.getCode().equals("pendingTruck")) {
+                    rowData.add(new ExcelData(vo.getPendingTruck()));
                 }
 
                 else if (item.getCode().equals("orderedTruckNum")) {