Merge remote-tracking branch 'origin/dev' into dev

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/product/BasePrice.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class BasePrice extends BaseDO {
@@ -92,4 +93,21 @@ public class BasePrice extends BaseDO {
     @JsonIgnore
     private int productPriceEmptyType = 0;
 
+
+    @ApiModelProperty(value = "特殊需求列表")
+    @TableField(exist = false)
+    private List<ProductPriceSpecialDO> specialDOList;
+
+    @ApiModelProperty(value = "运费包装价格列表")
+    @TableField(exist = false)
+    private List<ProductPricePackagingDO> freightPricePackagingList;
+
+    @ApiModelProperty(value = "清关费包装价格列表")
+    @TableField(exist = false)
+    private List<ProductPricePackagingDO> clearancePricePackagingList;
+
+    @ApiModelProperty(value = "全包价包装价格列表")
+    @TableField(exist = false)
+    private List<ProductPricePackagingDO> fullPricePackagingList;
+
 }

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/listener/ProductPriceExcelExportListener.java

@@ -193,7 +193,7 @@ public class ProductPriceExcelExportListener {
                                 StringBuilder ytqgfSb = new StringBuilder();
                                 StringBuilder ddyfSb = new StringBuilder();
                                 StringBuilder ddqgfSb = new StringBuilder();
-
+                                if (item.getPriceType() == 0) {
                                     if (CollectionUtil.isNotEmpty(yfStepList)) {
                                         yfStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
                                         for (int j = 1; j <= yfStepList.size(); j++) {
@@ -232,7 +232,7 @@ public class ProductPriceExcelExportListener {
                                             String unit = "";
                                             if (weightUnit != null) {
                                                 UnitDO unitDO = unitMap.get(weightUnit.intValue());
-                                            unit = Objects.nonNull(unitDO)?unitDO.getTitleZh():"空";
+                                                unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
                                             }
                                             BigDecimal startNum = stepDO.getStartNum();
                                             BigDecimal endNum = stepDO.getEndNum();
@@ -282,7 +282,7 @@ public class ProductPriceExcelExportListener {
                                             String unit = "";
                                             if (weightUnit != null) {
                                                 UnitDO unitDO = unitMap.get(weightUnit.intValue());
-                                            unit = unitDO.getTitleZh();
+                                                unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
                                             }
                                             BigDecimal startNum = stepDO.getStartNum();
                                             BigDecimal endNum = stepDO.getEndNum();
@@ -293,7 +293,8 @@ public class ProductPriceExcelExportListener {
                                             }
                                         }
                                     }
-
+                                }
+                                if (item.getPriceType() == 1) {
                                     if (CollectionUtil.isNotEmpty(qbjStepList) && item.getPriceType() == 1) {
                                         qbjStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
                                         for (int j = 1; j <= qbjStepList.size(); j++) {
@@ -343,7 +344,7 @@ public class ProductPriceExcelExportListener {
                                             }
                                         }
                                     }
-
+                                }
                                 transportPrice = transportPriceSb.toString();
                                 clearancePrice = clearancePriceSb.toString();
 

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/productPrice/ProductPriceReqBaseVO.java

 package cn.iocoder.yudao.module.product.vo.productPrice;
 
+import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPricePackagingDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPriceSpecialDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPriceStepDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;