外协结算

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java

@@ -52,10 +52,10 @@ public class PriceSheetVO {
     private String stairflag;
 
     /**
-     * 阶梯价标记key
+     * 阶梯价标记value
      */
-    @Schema(description = "阶梯价标记key")
+    @Schema(description = "阶梯价标记value")
-    private String stairflagkey;
+    private String stairflagvalue;
 
     /**
      * 阶梯上限

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -2067,11 +2067,11 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
     private boolean ruleTieredPricing(StatementVO statementVO, PriceSheetVO priceSheet) {
         //匹配阶梯价
         // 非阶梯价直接返回
-        if ("1".equals(priceSheet.getStairflagkey())) {
+        if ("1".equals(priceSheet.getStairflag())) {
             return true;
         }
         // 单批阶梯价（按件数）
-        else if ("4".equals(priceSheet.getStairflagkey())) {
+        else if ("4".equals(priceSheet.getStairflag())) {
             try {
                 double makeQty = statementVO.getMakeQty().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());
@@ -2082,7 +2082,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             }
         }
         // 单批阶梯价（按单件面积）
-        else if ("5".equals(priceSheet.getStairflagkey())) {
+        else if ("5".equals(priceSheet.getStairflag())) {
             try {
                 double ypArea = statementVO.getYpArea().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());
@@ -2093,7 +2093,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             }
         }
         // 单批阶梯价（按单批面积）
-        else if ("6".equals(priceSheet.getStairflagkey())) {
+        else if ("6".equals(priceSheet.getStairflag())) {
             try {
                 double totalArea = statementVO.getTotalArea().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());