|
|
@@ -295,6 +295,7 @@ public class ShoppingCart extends Controller {
|
|
|
|
|
|
Rows promotionItemsRows = dbConnect.runSqlQuery("select * from sa_promotion_items where siteid='" + siteid + "' and sa_promotionid=" + content.getLongValue("sa_promotionid"));
|
|
|
RowsMap promotionItemsRowsMap = promotionItemsRows.toRowsMap("itemid");
|
|
|
+ RowsMap promotionItemsByIdRowsMap = promotionItemsRows.toRowsMap("sa_promotion_itemsid");
|
|
|
//定制信息
|
|
|
CustomScheme customScheme = new CustomScheme(this);
|
|
|
|
|
|
@@ -309,10 +310,10 @@ public class ShoppingCart extends Controller {
|
|
|
row.put("oldprice", istool == 0 ? itemPrice.getContractprice() : itemPrice.getMarketprice());
|
|
|
if (content.getLongValue("sa_promotionid") > 0) {
|
|
|
|
|
|
- if (promotionItemsRowsMap.containsKey(row.getString("itemid"))) {
|
|
|
- if (promotionItemsRowsMap.get(row.getString("itemid")).isNotEmpty()) {
|
|
|
- row.put("orderminqty", promotionItemsRowsMap.get(row.getString("itemid")).get(0).getBigDecimal("orderminqty"));
|
|
|
- row.put("orderaddqty", promotionItemsRowsMap.get(row.getString("itemid")).get(0).getBigDecimal("orderaddqty"));
|
|
|
+ if (promotionItemsByIdRowsMap.containsKey(row.getString("sa_promotion_itemsid"))) {
|
|
|
+ if (promotionItemsByIdRowsMap.get(row.getString("sa_promotion_itemsid")).isNotEmpty()) {
|
|
|
+ row.put("orderminqty", promotionItemsByIdRowsMap.get(row.getString("sa_promotion_itemsid")).get(0).getBigDecimal("orderminqty"));
|
|
|
+ row.put("orderaddqty", promotionItemsByIdRowsMap.get(row.getString("sa_promotion_itemsid")).get(0).getBigDecimal("orderaddqty"));
|
|
|
}
|
|
|
|
|
|
}
|
