承运与无车承运对接

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

@@ -122,4 +122,10 @@ public interface PerformanceFeign {
                                                      @RequestParam(value = "prepaidArrearsOrder") BigDecimal prepaidArrearsOrder,
                                                      @RequestParam(value = "marginArrearsOrder") BigDecimal marginArrearsOrder);
 
+    /**
+     * 更新挂单运费
+     */
+    @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

@@ -6,12 +6,14 @@ import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -46,4 +48,12 @@ public class OrderGoodsFeignController {
         return Result.ok(orderGoodsService.listFreightEstimate(param));
     }
 
+    @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

@@ -60,6 +60,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

@@ -157,6 +157,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

@@ -99,4 +99,6 @@ public interface OrderGoodsService {
     IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 
     void batchUpdateResidueWeight(List<OrderGoods> list);
+
+    void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
 }

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

@@ -859,6 +859,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);