订单产品项运费单价和清关费单价最后变更时间补充

sql/v2.1/20250102.sql

 -- 增加订单产品项最后单价变更时间
 alter table ecw_order_item
-    add COLUMN `last_charge_price_time` datetime DEFAULT NULL COMMENT '最后单价变更时间';
+    add COLUMN `last_freight_charge_price_time` datetime DEFAULT NULL COMMENT '运费最后单价变更时间';
+alter table ecw_order_item
+    add COLUMN `last_clearance_charge_price_time` datetime DEFAULT NULL COMMENT '清关费最后单价变更时间';
 -- 批量更新订单产品项的最后单价变更时间
-update ecw_order_item set `last_charge_price_time` = update_time where last_charge_price_time is null;
\ No newline at end of file
+update ecw_order_item set `last_freight_charge_price_time` = update_time where last_freight_charge_price_time is null;
+update ecw_order_item set `last_clearance_charge_price_time` = update_time where last_clearance_charge_price_time is null;
\ No newline at end of file

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/orderItem/OrderItemDO.java

@@ -442,8 +442,11 @@ public class OrderItemDO extends BaseDO {
     @ApiModelProperty(value = "到仓：0 无牌 1 有牌 2 中性")
     private Integer checkBrandType;
 
-    @ApiModelProperty(value = "最后单价变更时间")
-    private Date lastChargePriceTime;
+    @ApiModelProperty(value = "最后运费单价变更时间")
+    private Date lastFreightChargePriceTime;
+
+    @ApiModelProperty(value = "最后清关费单价变更时间")
+    private Date lastClearanceChargePriceTime;
     /**
      * 到仓信息json
      */

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -3673,12 +3673,12 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         for (OrderItemDO orderItemDO : orderItemDOList) {
             for (ProdCostDto prodCostDto : resultDto.getProdCostDtoList()) {
                 if (Objects.equals(prodCostDto.getItemId(), orderItemDO.getOrderItemId())) {
-                    boolean isChargePrice = false;
+                    boolean isFreightChargePrice = false;
                     orderItemDO.setOriginalSeaFreight(prodCostDto.getOrgFreightPrice());
                     if ((Objects.isNull(prodCostDto.getOneFreight()) && Objects.nonNull(orderItemDO.getOneSeaFreight())) ||
                             (Objects.nonNull(prodCostDto.getOneFreight()) && Objects.isNull(orderItemDO.getOneSeaFreight())) ||
                             (Objects.nonNull(prodCostDto.getOneFreight()) && Objects.nonNull(orderItemDO.getOneSeaFreight()) && orderItemDO.getOneSeaFreight().compareTo(prodCostDto.getOneFreight()) != 0)){
-                        isChargePrice = true;
+                        isFreightChargePrice = true;
                     }
                     orderItemDO.setOneSeaFreight(prodCostDto.getOneFreight());
                     orderItemDO.setDiscountFreightPrice(prodCostDto.getDiscountFreightPrice());
@@ -3726,10 +3726,11 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     orderItemDO.setMinMeteringWeight(prodCostDto.getMinMeteringWeight());
 
                     orderItemDO.setOriginalClearanceFreight(prodCostDto.getOrgClearanceFeePrice());
+                    boolean isClearanceChargePrice = false;
                     if ((Objects.isNull(prodCostDto.getOneClearanceFee()) && Objects.nonNull(orderItemDO.getOneClearanceFreight())) ||
                             (Objects.nonNull(prodCostDto.getOneClearanceFee()) && Objects.isNull(orderItemDO.getOneClearanceFreight())) ||
                             (Objects.nonNull(prodCostDto.getOneClearanceFee()) && Objects.nonNull(orderItemDO.getOneClearanceFreight()) && orderItemDO.getOneClearanceFreight().compareTo(prodCostDto.getOneClearanceFee()) != 0)){
-                        isChargePrice = true;
+                        isClearanceChargePrice = true;
                     }
                     orderItemDO.setOneClearanceFreight(prodCostDto.getOneClearanceFee());
                     orderItemDO.setDiscountClearanceFeePrice(prodCostDto.getDiscountClearanceFeePrice());
@@ -3767,8 +3768,11 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     }
                     orderItemDO.setCharging(prodCostDto.getCharging());
                     orderItemDO.setIsPayAdvance(prodCostDto.getIsPayAdvance());
-                    if (isChargePrice){
-                        orderItemDO.setLastChargePriceTime(new Date());
+                    if (isFreightChargePrice){
+                        orderItemDO.setLastFreightChargePriceTime(new Date());
+                    }
+                    if (isClearanceChargePrice){
+                        orderItemDO.setLastClearanceChargePriceTime(new Date());
                     }
                 }
             }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderItem/OrderItemBackVO.java

@@ -464,8 +464,11 @@ public class OrderItemBackVO {
     @ApiModelProperty(value = "到仓：0 无牌 1 有牌 2 中性")
     private Integer checkBrandType;
 
-    @ApiModelProperty(value = "最后单价变更时间")
-    private Date lastChargePriceTime;
+    @ApiModelProperty(value = "最后运费单价变更时间")
+    private Date lastFreightChargePriceTime;
+
+    @ApiModelProperty(value = "最后清关费单价变更时间")
+    private Date lastClearanceChargePriceTime;
     /**
      * 到仓信息json
      */