1

src/main/java/com/egolm/shop/api/service/CartQueryService.java

-package com.egolm.shop.api.service;
-
-import java.util.Map;
-
-public interface CartQueryService { 
-	public Map<String, Object> query(String orgNo, String shopNo, String terminal) ;
-}
+package com.egolm.shop.api.service;
+
+import java.util.Map;
+
+public interface CartQueryService { 
+	public Map<String, Object> query(String orgNo, String shopNo, String terminal,String isCalcPromo) ;
+}

src/main/java/com/egolm/shop/api/service/impl/CartQueryServiceImpl.java

@@ -43,7 +43,7 @@ public class CartQueryServiceImpl implements CartQueryService {
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
-	public Map<String, Object> query(String orgNo, String shopNo, String terminal) {
+	public Map<String, Object> query(String orgNo, String shopNo, String terminal,String isCalcPromo) {
 		Rjx rjx = Rjx.json().set("IsValid", true);
 		if (!StringUtil.isNotUndefinedAndNull(shopNo, terminal)) {
 			throw new ReflectException("Query the shopping cart parameter error："
@@ -71,7 +71,13 @@ public class CartQueryServiceImpl implements CartQueryService {
 		} catch (Exception e1) { 
 			e1.printStackTrace();
 		}
-		 
+		
+		try {
+			String sql1 = "exec up_B2BCartToCartTempItem '" + shopNo + "', '"+isCalcPromo+"' "; //是否计算促销
+			jdbcTemplate.executeUpdate(sql1);
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
 		
 		
 		List<Map<String, Object>> datas = this.getGoodsList(orgNo, shopNo, terminal);

src/main/java/com/egolm/shop/api/service/impl/CartServiceImpl.java

@@ -216,7 +216,8 @@ public class CartServiceImpl implements CartService {
 		String orgNo = (String)params.get("orgNo");
 		String shopNO = params.get("shopNO")+"";
 		String terminal = params.get("terminal")+"";
-		Map<String, Object> queryMap = cartRedisService.query(orgNo, shopNO, terminal);
+		String isCalcPromo = params.get("isCalcPromo")+""; //"是否计算汇总 0为不计算，1为计算"
+		Map<String, Object> queryMap = cartRedisService.query(orgNo, shopNO, terminal,isCalcPromo);
 		/*Map<String, Object> countMap = this.count(orgNo, shopNO);
 		queryMap.putAll(countMap);*/
 		return Rjx.jsonOk().setData(queryMap).toJson();