x

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

 package com.egolm.shop.api.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -152,9 +153,7 @@ public class AddressServiceImpl implements AddressService {
  			return null;
 		}
 	}
-	public static void main(String[] args) {
-		System.out.println(0|1|2|1);
-	}
+
 	public String delete(String addId,String userNO,String shopNO,String langID) {
 		try {
 			  boolean isShopExists = userService.checkShopExists(userNO, shopNO);
@@ -230,6 +229,10 @@ public class AddressServiceImpl implements AddressService {
 		 }
 	}
 	
+	public static void main(String[] args) {
+		System.out.println(4&2);
+	}
+
 
 	@Override
 	public Map<String, Object> getDefaultAddress(String custNo, String shopNo) {
@@ -254,23 +257,32 @@ public class AddressServiceImpl implements AddressService {
 				+ " from tCustAddress where nTag&1 = 0 and sCustNO = ? and (sShopNO = ? or sShopNO is null or sShopNO = '') order by nTag desc, dLastUpdateTime desc";
 		List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, custNo, shopNo);
 		Map<String, Object> defMap = null;
-		Integer nTag_Cur = 0;
+		
+		List<Map<String, Object>> listTag6 = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> listTag4 = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> listTag2 = new ArrayList<Map<String, Object>>();
+		
+		
 		for(Map<String, Object> map : list) {
 			Integer nTag = (Integer)map.get("nTag");
 			if(nTag != null) {
 				if((nTag&6) == 6) {
-					defMap = map;
-					break;
+					listTag6.add(map);
+				} else if((nTag&4) == 4) {
+					listTag4.add(map);
 				} else if((nTag&2) == 2) {
-					defMap = map;
-				} else if((nTag&4) == 4 && (nTag_Cur&2) == 0) {
-					defMap = map;
+					listTag2.add(map);
 				}
-				nTag_Cur = nTag;
 			}
 		}
 		
-		if(defMap == null && list.size() > 0) {
+		if(listTag6.size() > 0) {
+			defMap = listTag6.get(0);
+		} else if(listTag2.size() > 0) {
+			defMap = listTag2.get(0);
+		} else if(listTag4.size() > 0) {
+			defMap = listTag4.get(0);
+		} else if(list.size() > 0) {
 			defMap = list.get(0);
 		}
 		return defMap;