订单明细新增更新是rwpricerate取值逻辑更改

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

@@ -173,17 +173,15 @@ public class OrderItems extends Controller {
             }
 
             custamount = item.getBigDecimal("custamount");
-            int year = Year.now().getValue();
-            int quarter = YearMonth.now().get(IsoFields.QUARTER_OF_YEAR);
+//            int year = Year.now().getValue();
+//            int quarter = YearMonth.now().get(IsoFields.QUARTER_OF_YEAR);
             Rows custamountrows = dbConnect.runSqlQuery("select * from sa_agents where sys_enterpriseid=" + sys_enterpriseid + " and siteid='" + siteid + "'");
-            if (!custamountrows.isEmpty()) {
-
-                if (custamountrows.get(0).getInteger("year") == year && custamountrows.get(0).getInteger("quarter") == quarter) {
-                    if (custamountrows.get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO) > 0) {
-                        rwpricerate = custamountrows.get(0).getBigDecimal("pricerate");
-                    }
+            if(custamountrows.isNotEmpty()){
+                if(custamountrows.get(0).getDouble("pricerate")>0){
+                    rwpricerate = custamountrows.get(0).getBigDecimal("pricerate");
                 }
             }
+
             //价格
             ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, itemid);
             price = orderItemsHelper.getPrice(orderRows.get(0), itemPrice, item);