x

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

@@ -519,14 +519,6 @@ public class UserServiceImpl implements UserService {
 		String mainBusiness = (String)parameters.get("mainBusiness");
 		Integer storeCount = (Integer)parameters.get("storeCount");
 		
-		Map<String, Object> custMap = jdbcTemplate.queryForMap("select * from tCustomer where sCustNO = ?", custNo);
-		String sMobile = (String)custMap.get("sMobile");
-		jdbcTemplate.update("update tCustomer set sCustName = ?, sSalesmanNO1 = ?, nStoreCount = ? where sCustNO = ?", customerName, salesmanNO1, storeCount, custNo);
-		jdbcTemplate.update("update tCustomer set nTag = 4 where sCustNO = ? and nTag&2 != 2", custNo);
-		jdbcTemplate.update("update tShop set sShopName = ?, sMainBusiness = ?, sProvinceID = ?, sCityID = ?, sDistrictID = ?, sAddress = ?, sEmail = ?, sMemo = ?, sSalesmanNO1 = ? where sShopNO = ?", shopName, mainBusiness, provinceId, cityId, districtId, address, email, memo, salesmanNO1, shopNo);
-		
-		List<Map<String, Object>> addrList = jdbcTemplate.queryForList("select * from tCustAddress where sCustNO = ? and sShopNO = ? and nTag&5 = 4", custNo, shopNo);
-		
 		List<Map<String, Object>> addrNameList = jdbcTemplate.queryForList("select sRegionNO, sRegionDesc from tRegion where sRegionNO = ? or sRegionNO = ? or sRegionNO = ?", provinceId, cityId, districtId);
 		Map<String, Map<String, Object>> addrmm = Util.listToMM(addrNameList, "sRegionNO");
 		Map<String, Object> pMap = addrmm.get(provinceId);
@@ -539,6 +531,16 @@ public class UserServiceImpl implements UserService {
 		cityName = cityName == null ? "" : cityName;
 		districtName = districtName == null ? "" : districtName;
 		
+		Map<String, Object> custMap = jdbcTemplate.queryForMap("select * from tCustomer where sCustNO = ?", custNo);
+		String sMobile = (String)custMap.get("sMobile");
+		jdbcTemplate.update("update tCustomer set sCustName = ?, sSalesmanNO1 = ?, nStoreCount = ? where sCustNO = ?", customerName, salesmanNO1, storeCount, custNo);
+		jdbcTemplate.update("update tCustomer set nTag = 4 where sCustNO = ? and nTag&2 != 2", custNo);
+		jdbcTemplate.update("update tShop set sShopName = ?, sMainBusiness = ?, sProvinceID = ?, sCityID = ?, sDistrictID = ?, sProvince = ?, sCity = ?, sDistrict = ?, sAddress = ?, sEmail = ?, sMemo = ?, sSalesmanNO1 = ? where sShopNO = ?", shopName, mainBusiness, provinceId, cityId, districtId, provinceName, cityName, districtName, address, email, memo, salesmanNO1, shopNo);
+		
+		List<Map<String, Object>> addrList = jdbcTemplate.queryForList("select * from tCustAddress where sCustNO = ? and sShopNO = ? and nTag&5 = 4", custNo, shopNo);
+		
+		
+		
 		if(addrList.size() == 0) {
 			Map<String, Object> addrMap = new HashMap<String, Object>();
 			addrMap.put("sAddrID", String.valueOf(System.currentTimeMillis()));