订单定制费用调整

src/custom/function/OrderFeeCalculatePlan1.java

@@ -7,6 +7,7 @@ import common.DataFunction;
 import common.YosException;
 import common.annotation.Param;
 import common.data.*;
+import org.apache.poi.hslf.dev.UserEditAndPersistListing;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -57,13 +58,14 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
         Rows dfRows = dbConnect.runSqlQuery("select sys_datafunctionid from sys_datafunction WHERE classname='OrderFeeCalculatePlan1' and status='启用' ");
         for (Row dfRow : dfRows) {
             String sys_datafunctionid = dfRow.getString("sys_datafunctionid");
+//            System.err.println(sys_datafunctionid);
             Rows itemRows = itemRowsMap.getOrDefault(sys_datafunctionid, new Rows());
             if (itemRows.isEmpty()) {
-                return super.action();
+                continue;
             }
             Rows paramsRows = dbConnect.runSqlQuery("SELECT * from sys_datafunction_params WHERE sys_datafunctionid=" + sys_datafunctionid);
-            if (paramsRows.isNotEmpty()) {
-                return super.action();
+            if (paramsRows.isEmpty()) {
+                continue;
             }
             RowsMap paramsRowsMap = paramsRows.toRowsMap("param");
             String ordertype = paramsRowsMap.get("ordertype").get(0).getString("value");
@@ -167,6 +169,9 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
                 dbConnect.runSqlUpdate(sqlList);
             }
 
+//            System.err.println(sys_datafunctionid);
+            System.err.println(sqlList);
+
         }
 
 
@@ -175,12 +180,16 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
 
     public BigDecimal getTotalprice(BigDecimal bdValue, BigDecimal bdUnitfee, BigDecimal itemFieldValue, String condition, String isaccumulation) {
         if (itemFieldValue.compareTo(bdValue) <= 0
-                && (condition.equals("1") || condition.equals("2") || condition.equals("3") || condition.equals("4"))) {
+                && (condition.equals("1") || condition.equals("2"))) {
+            return bdUnitfee;
+        }
+        if (itemFieldValue.compareTo(bdValue) >= 0
+                && (condition.equals("5") || condition.equals("4"))) {
             return bdUnitfee;
         }
         //数量，大于
         if (itemFieldValue.compareTo(bdValue) > 0
-                && condition.equals("5")) {
+                && condition.equals("3")) {
             if (bdValue.compareTo(BigDecimal.ZERO) > 0) {
                 if (isaccumulation.equals("1")) {
                     //累加