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

performance-web/src/main/java/com/clx/performance/controller/feign/OrderChildFeignController.java

@@ -13,6 +13,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -60,4 +61,12 @@ public class OrderChildFeignController {
         return Result.ok(feignOrderChildService.getLineStatistics(sendSystemAddressId, receiveSystemAddressId));
 
     }
+
+    @ApiOperation(value = "订单取消/到达最晚拉运时间同步最后一车", notes = "<br>By:刘海泉")
+    @RequestMapping(value = "/syncLastTruck", method = RequestMethod.GET)
+    Result<?> syncLastTruck(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo){
+        return lastTruckService.syncLastTruckChild4OrderTrigger(orderNo);
+
+    }
+
 }

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

@@ -103,6 +103,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     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)
         );

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) {
-
-        }
+        loginUserInfo  = TokenUtil.getLoginUserInfo();
         OrderGoodsEditParams orderGoodsParams = param.getOrderGoodsParams();
         OrderGoods oldOrderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsParams.getOrderGoodsNo()).get();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(param.getOrderNo());