Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/feign/DocumentFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.constraints.NotBlank;
 
-@FeignClient(name = "msl-document")
+@FeignClient(name = "msl-document",configuration = PerformanceClientConfiguration.class)
 public interface DocumentFeign {
 
     /**

performance-api/src/main/java/com/clx/performance/feign/IntegralTruckFeign.java

@@ -8,7 +8,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "clx-performance")
+@FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
 public interface IntegralTruckFeign {
 
     @ApiOperation(value = "新增车辆")

performance-api/src/main/java/com/clx/performance/feign/OrderChildFeign.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-@FeignClient(name = "clx-performance")
+@FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
 public interface OrderChildFeign {
 
 

performance-api/src/main/java/com/clx/performance/feign/PerformanceClientConfiguration.java

+package com.clx.performance.feign;
+
+import feign.Request;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class PerformanceClientConfiguration {
+
+    @Bean
+    public Request.Options requestOptions() {
+        return new Request.Options(5000, 5000);
+    }
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Set;
 
-@FeignClient(name = "clx-performance")
+@FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
 public interface PerformanceFeign {
 
     /**

performance-web/src/main/java/com/clx/performance/component/GoodsOrderTruckRecordComponent.java

@@ -69,7 +69,14 @@ public class GoodsOrderTruckRecordComponent {
 
     }
 
-    //释放车辆
+    //释放全部车辆
+    public void releaseAllDriverCard(String orderGoodsNo, String truckNo) {
+        log.info("执行释放车辆,货单号：{},车牌号：{}", orderGoodsNo, truckNo);
+        orderGoodsTruckBindDao.updateAllOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(), truckNo);
+        this.deleteTruckRecord(orderGoodsNo, truckNo);
+    }
+
+    //释放已接单车辆
     public void releaseDriverCard(String orderGoodsNo, String truckNo) {
         log.info("执行释放车辆,货单号：{},车牌号：{}", orderGoodsNo, truckNo);
         orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(), truckNo);

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

@@ -35,6 +35,9 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo);
 
+    void updateAllOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo);
+
+
     List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo);
 
     void updateOrderGoodsBindStatusExpire(String orderGoodsNo, String truckNo);

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

@@ -101,6 +101,16 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
 
     @Override
     public void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo) {
+        update(lUdWrapper()
+                .set(OrderGoodsTruckBind::getStatus, code)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getTruckNo, truckNo)
+        );
+    }
+
+    @Override
+    public void updateAllOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo) {
         update(lUdWrapper()
                 .set(OrderGoodsTruckBind::getStatus, code)
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)

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

@@ -699,7 +699,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderChildDao.updateEntityByKey(update);
 
         orderCancelComponent.backFillTonnageForArtificial(orderChild.getOrderGoodsNo(), orderChild.getWeight());
-        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+        goodsOrderTruckRecordComponent.releaseAllDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
         driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
 
         // 运单取消

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

@@ -295,12 +295,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Transactional(rollbackFor = Exception.class)
     public void updateEditOrderGoods(UpdateEditOrderGoodsParam param) {
         UserSessionData loginUserInfo = null;
-        try {
         loginUserInfo  = TokenUtil.getLoginUserInfo();
-
-        }catch (Exception e) {
-
-        }
         OrderGoodsEditParams orderGoodsParams = param.getOrderGoodsParams();
         OrderGoods oldOrderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsParams.getOrderGoodsNo()).get();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(param.getOrderNo());