Commit 59afa4f0 authored by 张永's avatar 张永

1

parent 7ac351e9
...@@ -98,8 +98,8 @@ public class CartQueryServiceImpl implements CartQueryService { ...@@ -98,8 +98,8 @@ public class CartQueryServiceImpl implements CartQueryService {
if(sGoodsTag != null && sGoodsTag.contains("门店装饰")) { if(sGoodsTag != null && sGoodsTag.contains("门店装饰")) {
isOrnament = true; isOrnament = true;
} }
Number invalid = (Number)data.get("isInvalid"); String invalid = data.get("isInvalid")+"";
if(invalid.intValue() == 1) { if(invalid.equals("1")) {
isInvalid = true; isInvalid = true;
} }
Number nTag_CG = (Number) data.get("nTag_CG"); Number nTag_CG = (Number) data.get("nTag_CG");
...@@ -120,7 +120,8 @@ public class CartQueryServiceImpl implements CartQueryService { ...@@ -120,7 +120,8 @@ public class CartQueryServiceImpl implements CartQueryService {
if (StringUtil.isNotEmpty(sPromoNo, sGroupNo)) { if (StringUtil.isNotEmpty(sPromoNo, sGroupNo)) {
String groupKey = sPromoNo + "$" + sGroupNo; String groupKey = sPromoNo + "$" + sGroupNo;
chooseGroups.add(groupKey); chooseGroups.add(groupKey);
} }
} }
List<Map<String, Object>> wmsList = getWmsList(datas,shopNo); List<Map<String, Object>> wmsList = getWmsList(datas,shopNo);
Util.replaceKey(datas, ":", false, "sShopNO:shopNo", "sAgentContractNO:contractNo", "nGoodsID:goodsId", Util.replaceKey(datas, ":", false, "sShopNO:shopNo", "sAgentContractNO:contractNo", "nGoodsID:goodsId",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment