x

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

@@ -314,9 +314,8 @@ public class GoodsServiceImpl implements GoodsService {
 			args.add("(t.sAgentContractNO = '" + kv[0] + "' and t.nGoodsID = " + kv[1] + ")");
 			
 		}
-		//String level = jdbcTemplate.queryForString("select c.sCustLeveTypeID from tCustomer c, tShop s where c.sCustNO = s.sCustNO and s.sShopNO = ?", shopNo);
-		//String sql = "select t.sAgentContractNO, t.nGoodsID, t.nStockQty, isnull(alp.nRealSalePrice, t.nRealSalePrice) nRealSalePrice from V_OrgGoods t left join tAgentLevelPrice alp on alp.nLevelID = " + level + " t.sAgentContractNO = alp.sAgentContractNO and t.nGoodsID = alp.nGoodsID where t.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args);
-		String sql = "select t.sAgentContractNO, t.nGoodsID, t.nStockQty, t.nRealSalePrice from V_OrgGoods t where t.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args);
+		String sCustTypeID = jdbcTemplate.queryForString("select c.sCustTypeID from tCustomer c, tShop s where c.sCustNO = s.sCustNO and s.sShopNO = ?", shopNo);
+		String sql = "select t.sAgentContractNO, t.nGoodsID, t.nStockQty, isnull(alp.nRealSalePrice, t.nRealSalePrice) nRealSalePrice from V_OrgGoods t left join tAgentCustTypePrice ap on ap.sCustTypeID = " + sCustTypeID + " and t.sAgentContractNO = ap.sAgentContractNO and t.nGoodsID = ap.nGoodsID where t.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args);
 		List<Map<String, Object>> datas = jdbcTemplate.queryForList(sql);
 		Map<String, Map<String, Object>> mm = Util.listToMM(datas, ":", "sAgentContractNO", "nGoodsID");