Merge branch 'dev/2024/0806/update-app-Y' of Harper/feifan-backend-zx-app into master

追加订单项中的结算价

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuRespVO.java

@@ -52,4 +52,10 @@ public class ProductSkuRespVO {
     @Schema(description = "高精度价格", example = "9255")
     private BigDecimal highPrecisionPrice;
 
+    @Schema(description = "结算价，单位： 分", example = "19500")
+    private Integer settlementPrice;
+
+    @Schema(description = "高精度结算价", example = "19997")
+    private BigDecimal highPrecisionSettlementPrice;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java

@@ -76,4 +76,10 @@ public class ProductSkuSaveReqVO {
 
     @Schema(description = "高精度价格", example = "9255")
     private BigDecimal highPrecisionPrice;
+
+    @Schema(description = "结算价，单位： 分", example = "19500")
+    private Integer settlementPrice;
+
+    @Schema(description = "高精度结算价", example = "19997")
+    private BigDecimal highPrecisionSettlementPrice;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -117,6 +117,15 @@ public class ProductSkuDO extends BaseDO {
      * 高精度价格
      */
     private BigDecimal highPrecisionPrice;
+
+    /**
+     * 结算价，单位： 分
+     */
+    private Integer settlementPrice;
+    /**
+     * 高精度结算价
+     */
+    private BigDecimal highPrecisionSettlementPrice;
     /**
      * 商品属性
      */

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -194,6 +194,16 @@ public class TradeOrderItemDO extends BaseDO {
      */
     private Integer costPrice;
 
+    /**
+     * 结算价，单位： 分
+     */
+    private Integer settlementPrice;
+    /**
+     * 高精度结算价
+     */
+    private BigDecimal highPrecisionSettlementPrice;
+
+
     /**
      * 商品属性
      */

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -684,6 +684,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
                 orderItem.setHighPrecisionPrice(productSkuDO.getHighPrecisionPrice());
                 orderItem.setCostPrice(productSkuDO.getCostPrice());
                 orderItem.setPromotionFee(productSkuDO.getPromotionFee());
+                orderItem.setSettlementPrice(productSkuDO.getSettlementPrice());
+                orderItem.setHighPrecisionSettlementPrice(productSkuDO.getHighPrecisionSettlementPrice());
             }
 
             // 2. 订单创建前的逻辑