x

src/main/java/com/egolm/shop/service/impl/CartRedisServiceImpl.java

@@ -927,6 +927,7 @@ public class CartRedisServiceImpl implements CartRedisService {
 	}
 
 	private List<Map<String, Object>> getGoodsList(String orgNo, String shopNo, String terminal) {
+		String sCustTypeID = jdbcTemplate.queryForString("select c.sCustTypeID from tCustomer c, tShop s where c.sCustNO = s.sCustNO and s.sShopNO = ?", shopNo);
 		String sqlCustBwList = "select bw.sPromoPaperNO from tPromoCustBWList bw, tCustomer c, tShop s where bw.sShopNO = c.sCustTypeID and c.sCustNO = s.sCustNO and s.sShopNO = '" + shopNo + "'";
 		String sqlPromoTag = 
 				"SELECT " 
@@ -950,7 +951,7 @@ public class CartRedisServiceImpl implements CartRedisService {
 						+ "DELETE tCart WHERE sShopNO = '" + shopNo + "' AND nTag = 1 AND sPromoPaperNO IN (" + sqlClearPromoNo + ")" + Util.LINE_SEPARATOR 
 						+ "UPDATE tCart SET sPromoGroupNO = NULL, sPromoPaperNO = NULL WHERE sShopNO = '" + shopNo + "' AND sPromoPaperNO IN (" + sqlClearPromoNo + ")" + Util.LINE_SEPARATOR
 						+ "UPDATE tCart SET sPromoGroupNO = NULL, sPromoPaperNO = NULL WHERE sShopNO = '" + shopNo + "' AND sPromoPaperNO NOT IN (" + sqlCustBwList + ")";
-		String sqlACart = "select * from V_Cart where sOrgNO = '" + orgNo + "' and sShopNO = '" + shopNo + "' order by nIdx";
+		String sqlACart = "select t.*, ap.nRealSalePrice nApSalePrice from V_Cart t left join tAgentCustTypePrice ap on ap.sCustTypeID = '" + sCustTypeID + "' and ap.sAgentContractNO = t.sAgentContractNO and ap.nGoodsID = t.nGoodsID where t.sOrgNO = '" + orgNo + "' and t.sShopNO = '" + shopNo + "' order by t.nIdx";
 
 		String sqlp = ""
 				+ "     SELECT                                                                                  "
@@ -1027,6 +1028,10 @@ public class CartRedisServiceImpl implements CartRedisService {
 
 		for (Map<String, Object> map : datas) {
 			Integer nPartakeNum = Util.objTo(map.get("nPartakeNum"), Integer.class, 0);
+			BigDecimal nApSalePrice = (BigDecimal)map.get("nApSalePrice");
+			if(nApSalePrice != null) {
+				map.put("nRealSalePrice", nApSalePrice);
+			}
 			String sPromoPaperNO = (String) map.get("sPromoPaperNO");
 			if (StringUtil.isNotBlank(sPromoPaperNO) && nPartakeNum > 0) {
 				for (Map<String, Object> pm : pds) {