冲突调整

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1528,21 +1528,6 @@ public class Order extends Controller {
         BigDecimal amountAll = amount;
         BigDecimal costamount_single = BigDecimal.ZERO;
         //查询是否有定制费用，sa_order_cost
-        //查询定制费用
-        String sql = "SELECT ifnull(sum(costamount),0) costamount from sa_order_cost WHERE sa_orderid=" + sa_orderid;
-        BigDecimal costamount = dbConnect.runSqlQuery(0, sql).getBigDecimal("costamount");
-        if (costamount.compareTo(BigDecimal.ZERO) > 0) {
-            System.err.println(costamount);
-            amountAll = amount.add(costamount);
-            amount = amountAll;
-            //查询单独扣款金额
-            sql = "SELECT ifnull(sum(costamount),0) costamount from sa_order_cost WHERE sys_datafunctionid in (SELECT sys_datafunctionid from sys_datafunction_params WHERE value=1 and param='ispay' ) and sa_orderid=" + sa_orderid;
-            costamount_single = dbConnect.runSqlQuery(0, sql).getBigDecimal("costamount");
-            if (costamount_single.compareTo(BigDecimal.ZERO) > 0) {
-                amount = amountAll.subtract(costamount_single);
-            }
-        }
-
 
         String order_paymentnode = Parameter.get(siteid, "order_paymentnode");
         //订单返利使用开关