|
|
@@ -195,7 +195,9 @@ public class OrderItems extends Controller {
|
|
|
// }
|
|
|
}
|
|
|
if(type.equals("特殊订单")){
|
|
|
- if (sa_orderitemsid > 0) {
|
|
|
+ System.out.println(111);
|
|
|
+ if (item.containsKey("defaultprice")) {
|
|
|
+ System.out.println(222);
|
|
|
if(item.getBigDecimalValue("price").compareTo(BigDecimal.ZERO)>0 && item.getBigDecimalValue("amount").compareTo(BigDecimal.ZERO)<=0){
|
|
|
sqlFactory.addParameter("price", item.getBigDecimalValue("price"));
|
|
|
//折前金额（元）
|
|
|
@@ -206,6 +208,7 @@ public class OrderItems extends Controller {
|
|
|
sqlFactory.addParameter("amount", item.getBigDecimalValue("amount"));
|
|
|
}
|
|
|
}else {
|
|
|
+ System.out.println(333);
|
|
|
sqlFactory.addParameter("price", price);
|
|
|
//折前金额（元）
|
|
|
sqlFactory.addParameter("amount", price.multiply(qty));
|
|
|
@@ -477,7 +480,7 @@ public class OrderItems extends Controller {
|
|
|
|
|
|
}
|
|
|
Long sa_orderid = content.getLong("sa_orderid");
|
|
|
-
|
|
|
+ Long sys_enterpriseid1 = sys_enterpriseid;
|
|
|
Rows orderRows = getOrderRows(this, sa_orderid);
|
|
|
Long sa_brandid = 0L;
|
|
|
String tradefield = "";
|
|
|
@@ -497,7 +500,7 @@ public class OrderItems extends Controller {
|
|
|
case "特殊订单":
|
|
|
sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单", pageSize, pageNumber, pageSorting);
|
|
|
sqlFactory.addParameter("tradefield", tradefield);
|
|
|
- if(sys_enterpriseid>0){
|
|
|
+ if(sys_enterpriseid1>0){
|
|
|
where.append(" and t1.isonsale ='1' ");
|
|
|
}
|
|
|
break;
|
