Merge remote-tracking branch 'origin/master' into v7.8_listenAndComplaint_20231208

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -63,4 +63,11 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_LARGE_SCREEN_QUEUE ="clx-order.order.large.screen.queue";
 
+
+    // 预付运费和保证金 自动冻结 触发消息队列
+    public static final String FREEZE_TRIGGER_EXCHANGE = "clx-order.freeze.trigger.exchange";
+    public static final String FREEZE_TRIGGER_QUEUE = "clx-order.freeze.trigger.queue";
+    public static final String FREEZE_TRIGGER_ROUTING_KEY = "clx-order.freeze.trigger.routing.key";
+
+
 }

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

@@ -27,7 +27,7 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     Optional<OrderGoodsTruckBind> getValidByOrderGoodsNoAndTruckNo(String truckNo);
     Optional<List<OrderGoodsTruckBind>> getValidByTruckNo(String truckNo);
 
-    Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList);
+    List<String> selectListByTruckNo(List<String> truckList);
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code);
 

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

@@ -2,7 +2,6 @@ package com.clx.performance.dao.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.mapper.OrderGoodsTruckBindMapper;
@@ -75,10 +74,8 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
 
 
     @Override
-    public Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList) {
-        return Optional.ofNullable(baseMapper.selectList(new QueryWrapper<OrderGoodsTruckBind>().lambda()
-                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
-                .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
+    public List<String> selectListByTruckNo(List<String> truckList) {
+        return baseMapper.selectListByTruckNo(truckList);
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/extranal/user/impl/OwnerInfoServiceImpl.java

@@ -20,7 +20,7 @@ public class OwnerInfoServiceImpl implements OwnerInfoService {
     @Override
     public OwnerInfoFeignVO getOwnerInfo(Long userNo) {
         return Optional.ofNullable(ownerInfoFeign.getOwnerInfo(userNo))
-                .filter(Result::succeed).map(item->item.getData()).orElseThrow(ResultCodeEnum.FAIL);
+                .filter(Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL,"未查询到对应的货主信息");
     }
 
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsTruckBindMapper.java

 package com.clx.performance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.sqlProvider.OrderGoodsTruckBindSqlProvider;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,7 +26,8 @@ public interface OrderGoodsTruckBindMapper extends BaseMapper<OrderGoodsTruckBin
     @Select("select truck_no from order_goods_truck_bind where order_goods_no=#{orderGoodsNo}")
     List<Integer> getTrucksByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
 
-    List<OrderGoodsDriverTruck> selectListByTruckNo(List<OrderGoodsDriverTruck> truckList);
+    @SelectProvider(type = OrderGoodsTruckBindSqlProvider.class, method = "selectListByTruckNo")
+    List<String> selectListByTruckNo(List<String> truckList);
 
 
     @SelectProvider(type = OrderGoodsTruckBindSqlProvider.class, method = "findUnreleasedTruck")

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.OrderEnum;
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -381,8 +382,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, orderChild);
 
-        // 更新定向单状态
-        updateOrderGoodsDirect(bind);
+        // 更新定向平台车状态，自由车状态不更新
+        updateOrderGoodsDirect(orderGoods,bind);
+
 
         // 新增运单
         orderChildDao.saveEntity(orderChild);
@@ -477,7 +479,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         // 更新定向派单
-        updateOrderGoodsDirectReject(orderGoodsTruckBind);
+        updateOrderGoodsDirectReject(orderGoods,orderGoodsTruckBind);
     }
 
     @Override
@@ -858,9 +860,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新出车状态
         updateDriverOrderStatusUnload(orderChild.getDriverUserNo(), orderChild.getTruckId());
 
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         //释放车辆
-        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
-
+        //非自有车辆配货的进行车辆释放
+        if(!Objects.equals(orderGoods.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
+            goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+        }
         // 发送mq 卸车
         orderChildMqService.orderChildUnload(orderChild.getChildNo());
     }
@@ -1150,8 +1155,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 返回吨数
         updateOrderGoodsAmountReturn(orderChild, orderGoods);
 
-        // 取消定向
-        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
+        //取消车辆绑定
+        updateOrderGoodsDirectCancel(orderGoods,orderGoodsTruckBind);
 
         orderChildDao.updateCancel(orderChild);
 
@@ -1210,7 +1215,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         updateOrderGoodsAmountReturn(orderChild, orderGoods);
 
         // 取消定向
-        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
+        updateOrderGoodsDirectCancel(orderGoods,orderGoodsTruckBind);
 
         orderChildDao.updateCancel(orderChild);
 
@@ -1447,11 +1452,13 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新定向单状态 (接单)
      */
-    private void updateOrderGoodsDirect(OrderGoodsTruckBind orderGoodsTruckBind) {
+    private void updateOrderGoodsDirect(OrderGoods orderGoods,OrderGoodsTruckBind orderGoodsTruckBind) {
         if (orderGoodsTruckBind == null) {
             return;
         }
-
+        if(Objects.equals(orderGoods.getVehicleUsage(), VehicleUsageEnum.Status.OWN.getCode())){
+            return;
+        }
         orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.ORDER.getCode());
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
     }
@@ -1459,7 +1466,11 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新定向派单状态 (拒绝)
      */
-    private void updateOrderGoodsDirectReject(OrderGoodsTruckBind orderGoodsTruckBind) {
+    private void updateOrderGoodsDirectReject(OrderGoods orderGoods,OrderGoodsTruckBind orderGoodsTruckBind) {
+        if(Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())){
+            //定向平台车辆取消绑定，自由车辆状态绑定状态不变
+            return;
+        }
         orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.CANCEL.getCode());
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
         goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoodsTruckBind.getOrderGoodsNo(), orderGoodsTruckBind.getTruckNo());
@@ -1468,10 +1479,14 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 更新定向派单状态 (取消)
      */
-    private void updateOrderGoodsDirectCancel(OrderGoodsTruckBind orderGoodsTruckBind) {
+    private void updateOrderGoodsDirectCancel(OrderGoods orderGoods,OrderGoodsTruckBind orderGoodsTruckBind) {
         if (orderGoodsTruckBind == null) {
             return;
         }
+        if(Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())){
+            //定向平台车辆取消绑定，自由车辆状态绑定状态不变
+            return;
+        }
 
         orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.CANCEL.getCode());
         orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);

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

@@ -159,7 +159,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Override
     public void updateOrderGoodsReduceWeightAndStatus(OrderGoods orderGoods, OrderChild orderChild, Integer orderGoodsStatus) {
         orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChild.getWeight(), orderGoodsStatus);
-        if (orderGoods.getResidueTransportWeight().compareTo(orderChild.getWeight()) <= 0) {
+        //货单没有辆，并且货单用车非自有车
+        if (orderGoods.getResidueTransportWeight().compareTo(orderChild.getWeight()) <= 0
+                && !Objects.equals(orderGoods.getVehicleUsage(),VehicleUsageEnum.Status.OWN.getCode())) {
             //释放其他车辆
             goodsOrderTruckRecordComponent.releaseDriverAndTruckBind(orderGoods.getOrderGoodsNo(), orderChild.getTruckNo());
         }
@@ -176,7 +178,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
             List<String> truckNoList = new ArrayList<>();
 
-            //查询当前用户是否是货主
+            //查询当前用户是否是车主
             Long driverUserNo = orderGoodsListParam.getDriverUserNo();
             Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
             log.info("通过用户编号:{} 查询本人车辆，查询结果:{}", driverUserNo, JSON.toJSONString(ownTruckByUserNo));
@@ -192,14 +194,13 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 log.warn("用户编号:{},查询车主车辆和作为司机的车辆全未查询到数据", driverUserNo);
                 return new Page<>();
             }
-            Optional<List<OrderGoodsTruckBind>> orderGoodsDriverTrucks = orderGoodsTruckBindDao.selectListByTruckNo(
+            //自有车辆的货单接单之后还可以再次看到
+            List<String> orderGoodsNoList = orderGoodsTruckBindDao.selectListByTruckNo(
                     truckNoList);
-            if (!orderGoodsDriverTrucks.isPresent() || orderGoodsDriverTrucks.get().isEmpty()) {
+            if (CollectionUtils.isEmpty(orderGoodsNoList)) {
                 log.warn("用户编号:{},无专属单", driverUserNo);
                 return new Page<>();
             }
-
-            List<String> orderGoodsNoList = orderGoodsDriverTrucks.get().stream().map(OrderGoodsTruckBind::getOrderGoodsNo).collect(Collectors.toList());
             return orderGoodsDao.exclusiveOrderPageGoodsList(orderGoodsListParam, orderGoodsNoList);
         }
     }

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

@@ -4,16 +4,21 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.message.feign.ClxMessageOpenapiFeign;
 import com.clx.message.req.message.AliSmsMessageReq;
+import com.clx.order.param.mq.FreezeTriggerMqParam;
+import com.clx.performance.common.MqWrapper;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.ClxMessageConfig;
 import com.clx.performance.constant.RedisConstants;
+import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.enums.IdTypeEnum;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.*;
 import com.clx.performance.param.app.CheckMobileParam;
 import com.clx.performance.param.app.InformationParam;
@@ -37,6 +42,7 @@ import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.clx.user.feign.OwnerFeign;
+import com.clx.user.enums.owner.FreezeSettingEnum;
 import com.clx.user.feign.OwnerInfoFeign;
 import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -52,6 +58,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -62,6 +71,9 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -97,6 +109,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     private final OwnerAccountPasswordDao ownerAccountPasswordDao;
 
 
+    private final RabbitTemplate rabbitTemplate;
+
+    private final OwnerInfoService ownerInfoService;
+
     @Override
     public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {
         return ownerAccountDao.pageList(param);
@@ -353,8 +369,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             //给对应账户增加金额
             BigDecimal topUpBalance = ownerTopUp.getTopUpBalance();
             LocalDateTime now = LocalDateTime.now();
+            Long ownerUserNo;
+            String ownerUserName;
             while (true) {
                 OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(ownerTopUp.getOwnerUserNo(), param.getAccountType());
+                ownerUserNo = account.getOwnerUserNo();
+                ownerUserName = account.getOwnerUserName();
                 OwnerAccount update = new OwnerAccount();
                 update.setAccountBalance(topUpBalance);
                 update.setUsableBalance(topUpBalance);
@@ -387,8 +407,17 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                     break;
                 }
             }
-
-
+            OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(ownerUserNo);
+            //充值成功并且当前货主是冻结方式是自动冻结，则触发自动冻结的mq监听
+            if(Objects.equals(ownerInfo.getFreezeSetting(), FreezeSettingEnum.AUTO.getCode())){
+                log.info("货主编码:{},货主姓名:{},充值成功金额：{},发送自动冻结的mq消息",ownerUserNo,ownerUserName,topUpBalance);
+                FreezeTriggerMqParam mq = new FreezeTriggerMqParam();
+                mq.setUserNo(ownerUserNo);
+                Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(mq)).getBytes()).build();
+                //设置延时5秒处理，防止事务未提交
+                message.getMessageProperties().setExpiration("5000");
+                rabbitTemplate.send(RabbitKeyConstants.FREEZE_TRIGGER_EXCHANGE, RabbitKeyConstants.FREEZE_TRIGGER_ROUTING_KEY,message);
+            }
         }
     }
 

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

 package com.clx.performance.sqlProvider;
 
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import org.apache.ibatis.jdbc.SQL;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class OrderGoodsTruckBindSqlProvider {
 
@@ -33,5 +35,14 @@ public class OrderGoodsTruckBindSqlProvider {
 
         }}.toString();
     }
+    public String selectListByTruckNo(List<String> truckList){
+        return new SQL(){{
+            SELECT(" a.order_goods_no ");
+            FROM("order_goods_truck_bind a");
+            LEFT_OUTER_JOIN("order_goods b on a.order_goods_no = b.order_goods_no");
+            WHERE("a.truck_no IN ("  + truckList.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
+            WHERE("b.vehicle_usage = " + VehicleUsageEnum.Status.OWN.getCode()  + " or a.`status` =" + OrderGoodsTruckBindEnum.Status.NORMAL.getCode());
+        }}.toString();
+    }
 
 }

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

 package com.clx.performance.strategy;
 
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.performance.param.pc.OrderGoodsChildParams;
 import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.enums.OrderStopEnum;
@@ -12,15 +13,13 @@ import com.clx.performance.utils.SpringContextUtils;
 import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 
 import java.time.LocalDateTime;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -48,7 +47,8 @@ public abstract class GoodsOrderStrategy {
         List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
         Set<String> set = new HashSet<>();
         for (OrderGoodsChildParams item : orderGoodsChildParams) {
-            if (CollectionUtils.isNotEmpty(item.getTruckList())) {
+            //定向车自由车辆不做拦截操作
+            if (!StringUtils.equals(item.getVehicleUsage(),String.valueOf(VehicleUsageEnum.Status.OWN.getCode())) && CollectionUtils.isNotEmpty(item.getTruckList())) {
                 int lastSize = set.size() + item.getTruckList().size();
                 set.addAll(item.getTruckList());
                 if (!Objects.equals(lastSize, set.size())) {
@@ -63,8 +63,7 @@ public abstract class GoodsOrderStrategy {
             if (CollectionUtils.isNotEmpty(binds)) {
                 List<String> repeatBind = binds.stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
                 String trucks = String.join(", ", repeatBind);
-                throw new ServiceSystemException(ResultEnum.DATA_ERROR, "已被定向单绑定车辆：" + trucks);
-            }
+                throw new ServiceSystemException(ResultEnum.DATA_ERROR, "已被定向单绑定车辆：" + trucks);            }
         }
         //根据不同的订单类型创建不同的货单
         LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);