Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into dev

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

@@ -132,4 +132,10 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/orderGoods/saveBindTruck"})
     Result<Object> saveBindTruck(@RequestBody @Validated DistributionTruckParam param);
 
+    /**
+     * 更新挂单运费
+     */
+    @GetMapping(value = {"clx-performance/feign/orderGoods/updatePendingOrderFright"})
+    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight);
+
 }

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -56,4 +57,12 @@ public class OrderGoodsFeignController {
     }
 
 
+    @ApiOperation(value = "更新挂单运费", notes = "<br>By:艾庆国")
+    @GetMapping(value = {"/updatePendingOrderFright"})
+    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight){
+
+        orderGoodsService.updateFrightPrice(orderGoodsNo, pendingOrderFreight);
+        return Result.ok();
+    }
+
 }

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

@@ -61,6 +61,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     List<OrderGoods> listIntegralOrderGoodsSync();
 
     boolean updatePendingOrderFreightById(Integer id, BigDecimal pendingOrderFreight);
+    boolean updatePendingOrderFreightByIdList(BigDecimal pendingOrderFreight, List<Integer>idList);
 
     Boolean updateStopFlagByOrderNo(String orderNo, Integer stopFlag);
 

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

@@ -158,6 +158,15 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         return update(lUdWrapper().eq(OrderGoods :: getId,id).set(OrderGoods :: getPendingOrderFreight,pendingOrderFreight));
     }
 
+    @Override
+    public boolean updatePendingOrderFreightByIdList(BigDecimal pendingOrderFreight, List<Integer> idList) {
+        return update(lUdWrapper()
+                .in(OrderGoods::getId,idList)
+                .set(OrderGoods::getPendingOrderFreight,pendingOrderFreight)
+        );
+
+    }
+
     @Override
     public Boolean updateStopFlagByOrderNo(String orderNo, Integer stopFlag) {
         return update(lUdWrapper().eq(OrderGoods :: getOrderNo,orderNo).set(OrderGoods :: getStopFlag,stopFlag));

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -102,4 +102,6 @@ public interface OrderGoodsService {
     void batchUpdateResidueWeight(List<OrderGoods> list);
 
     void saveBindTruck(DistributionTruckParam param);
+
+    void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
 }

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

@@ -923,6 +923,14 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsDao.batchUpdateResidueWeight(collect,BigDecimal.ZERO);
     }
 
+    @Override
+    public void updateFrightPrice(String orderNo, BigDecimal pendingOrderFreight) {
+        List<OrderGoods> list = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+        if (list.isEmpty()) {return;}
+        log.info("更新货单运费, orderNo:{}, pendingOrderFreight:{}", orderNo, pendingOrderFreight);
+        orderGoodsDao.updatePendingOrderFreightByIdList(pendingOrderFreight, list.stream().map(item->item.getId()).collect(Collectors.toList()));
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         orderGoodsCancelMap.put(1, this::cancelOperateOneTypeStrategy);