Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-api/src/main/java/com/clx/order/params/UpdateEditOrderGoodsParam.java → performance-api/src/main/java/com/clx/performance/param/pc/UpdateEditOrderGoodsParam.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import lombok.Getter;
 import lombok.Setter;

performance-api/src/main/java/com/clx/performance/param/pc/UpdateOrderGoodsPriceParam.java

+package com.clx.performance.param.pc;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @ClassName UpdateOrderGoodsPriceParam
+ * @Description
+ * @Author kavin
+ * @Date 2023/10/26 10:30
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class UpdateOrderGoodsPriceParam {
+
+    @NotNull(message = "货单id不能为空")
+    @ApiModelProperty("货单id")
+    private Integer id;
+
+
+    @NotNull(message = "挂单运费不能为空")
+    @ApiModelProperty("挂单运费")
+    @MoneyInConvert
+    private BigDecimal pendingOrderFreight;
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.params.PageOrderGoodsListParam;
-import com.clx.order.params.UpdateEditOrderGoodsParam;
+import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.pc.OrderChildPCVO;
@@ -142,4 +143,12 @@ public class GoodsOrderController {
     public Result<BigDecimal> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
         return Result.ok(orderGoodsService.orderCancelResidueWeight(orderNo,optionType));
     }
+
+    @ApiOperation(value = "调整货单价格", notes = "<br>By:刘海泉")
+    @PostMapping("/updateOrderGoodsPrice")
+    public Result updateOrderGoodsPrice(UpdateOrderGoodsPriceParam param) {
+        orderGoodsService.updateOrderGoodsPrice(param);
+        return Result.ok();
+    }
+
 }

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

@@ -55,4 +55,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     List<OrderGoods> listIntegralOrderGoodsSync();
 
+    boolean updatePendingOrderFreightById(Integer id, BigDecimal pendingOrderFreight);
 }

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

@@ -145,5 +145,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         );
     }
 
-
+    @Override
+    public boolean updatePendingOrderFreightById(Integer id, BigDecimal pendingOrderFreight) {
+        return update(lUdWrapper().eq(OrderGoods :: getGoodsId,id).set(OrderGoods :: getPendingOrderFreight,pendingOrderFreight));
+    }
 }

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

@@ -3,9 +3,10 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.PageOrderGoodsListParam;
-import com.clx.order.params.UpdateEditOrderGoodsParam;
+import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
@@ -40,4 +41,6 @@ public interface OrderGoodsService {
     BigDecimal orderCancelResidueWeight(String orderNo,String optionType);
 
     void updateEditOrderGoods(UpdateEditOrderGoodsParam param);
+
+    void updateOrderGoodsPrice(UpdateOrderGoodsPriceParam param);
 }

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
-import com.clx.order.params.UpdateEditOrderGoodsParam;
+import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -16,6 +16,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.OrderGoodsStruct;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
@@ -222,5 +223,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
     }
 
+    @Override
+    public void updateOrderGoodsPrice(UpdateOrderGoodsPriceParam param) {
+
+        orderGoodsDao.updatePendingOrderFreightById(param.getId(),param.getPendingOrderFreight());
 
+        //记录货单调价日志
+
+    }
 }