diff --git a/src/main/java/com/kh/samdado/admin/controller/AdminController.java b/src/main/java/com/kh/samdado/admin/controller/AdminController.java index 913c2f54..11a6fe01 100644 --- a/src/main/java/com/kh/samdado/admin/controller/AdminController.java +++ b/src/main/java/com/kh/samdado/admin/controller/AdminController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.SessionAttributes; -import com.google.gson.Gson; import com.kh.samdado.admin.model.exception.AdminException; import com.kh.samdado.admin.model.service.AdminService; import com.kh.samdado.admin.model.vo.A_board; @@ -471,7 +470,6 @@ public String rejectBannerAd(@ModelAttribute Alliance alliance, if (alliance.getAmassage().equals("이미지 불일치")) { result = aService.updateRejectBannerAdStatusRI(alliance); // RI - //int insertNews = mService.insertAlliNews(usno); alert.setAlstatus("RI"); insertNew = mService.insertNewApprove(alert); } else { // 포인트 미충전 @@ -491,39 +489,26 @@ public String sendSMS() { return "admin/sendSMSForm"; } - @GetMapping("/selectGetProfit") - public @ResponseBody String selectGetProfit() { + @PostMapping("/selectGetUserData") + public @ResponseBody List selectGetUserData(@RequestBody User userType) { - List profits = aService.selectGetProfit(); - - return new Gson().toJson(profits); + List userData = aService.selectGetUserData(userType); + return userData; } @PostMapping("/selectGetAllProfit") public @ResponseBody List selectGetAllProfit(@RequestBody Income profitType) { List profitRequestResult = aService.selectGetAllProfit(profitType); - - //System.out.println("profitRequestResult : " + profitRequestResult); - return profitRequestResult; } @PostMapping("/sendAboard") public String sendAboard(A_board aboard, Model model) { - - //System.out.println("aboard : " + aboard); - int insertAboard = aService.insertAboard(aboard); - - // -- 은솔 : news에 새로운 공지사항 넣기 - // 1. bno 찾아오기 - int findBno = mService.findNewBno(aboard); - - aboard.setBno(findBno); - int insertNews = mService.insertNewBoard(aboard); - - if (insertAboard > 0 && insertNews > 0) { + int insertNewsUser = mService.updateNewUserNews(aboard); + + if (insertAboard > 0 && insertNewsUser > 0) { //System.out.println("insertAboard 결과 : " + insertAboard); model.addAttribute("msg", "공지글 등록에 성공하였습니다."); return "redirect:/admin/home"; diff --git a/src/main/java/com/kh/samdado/admin/model/dao/AdminDao.java b/src/main/java/com/kh/samdado/admin/model/dao/AdminDao.java index 2fddae37..e71fe5ed 100644 --- a/src/main/java/com/kh/samdado/admin/model/dao/AdminDao.java +++ b/src/main/java/com/kh/samdado/admin/model/dao/AdminDao.java @@ -11,6 +11,7 @@ import com.kh.samdado.common.model.vo.Report; import com.kh.samdado.mypage.model.vo.Point; import com.kh.samdado.mypage.model.vo.QnA; +import com.kh.samdado.user.model.vo.User; public interface AdminDao { @@ -58,7 +59,8 @@ public interface AdminDao { List getPointList(); - List selectGetProfit(); + //List selectGetProfit(); + List selectGetUserData(User userType); Report selectReport(Report report); @@ -80,4 +82,6 @@ public interface AdminDao { + + } diff --git a/src/main/java/com/kh/samdado/admin/model/dao/AdminDaoImpl.java b/src/main/java/com/kh/samdado/admin/model/dao/AdminDaoImpl.java index a8a7f443..5da79e7d 100644 --- a/src/main/java/com/kh/samdado/admin/model/dao/AdminDaoImpl.java +++ b/src/main/java/com/kh/samdado/admin/model/dao/AdminDaoImpl.java @@ -16,6 +16,7 @@ import com.kh.samdado.common.model.vo.Report; import com.kh.samdado.mypage.model.vo.Point; import com.kh.samdado.mypage.model.vo.QnA; +import com.kh.samdado.user.model.vo.User; @Repository public class AdminDaoImpl implements AdminDao { @@ -161,10 +162,16 @@ public List getPointList() { return sqlSession.selectList("adminMapper.getPointList"); } +// @Override +// public List selectGetProfit() { +// // TODO Auto-generated method stub +// return sqlSession.selectList("adminMapper.selectGetProfit"); +// } + @Override - public List selectGetProfit() { + public List selectGetUserData(User userType) { // TODO Auto-generated method stub - return sqlSession.selectList("adminMapper.selectGetProfit"); + return sqlSession.selectList("adminMapper.selectGetUserData", userType); } @Override @@ -209,6 +216,8 @@ public List selectGetAllProfit(Income profitRequestDto) { return sqlSession.selectList("adminMapper.selectGetAllProfit", profitRequestDto); } + + diff --git a/src/main/java/com/kh/samdado/admin/model/service/AdminService.java b/src/main/java/com/kh/samdado/admin/model/service/AdminService.java index 7171a535..e464672b 100644 --- a/src/main/java/com/kh/samdado/admin/model/service/AdminService.java +++ b/src/main/java/com/kh/samdado/admin/model/service/AdminService.java @@ -12,6 +12,7 @@ import com.kh.samdado.common.model.vo.Report; import com.kh.samdado.mypage.model.vo.Point; import com.kh.samdado.mypage.model.vo.QnA; +import com.kh.samdado.user.model.vo.User; public interface AdminService { @@ -64,7 +65,8 @@ public interface AdminService { List getPointList(); - List selectGetProfit(); + //List selectGetProfit(); + List selectGetUserData(User userType); Report selectReport(Report report); @@ -81,4 +83,6 @@ public interface AdminService { List selectGetAllProfit(Income profitRequestDto); + + } \ No newline at end of file diff --git a/src/main/java/com/kh/samdado/admin/model/service/AdminServiceImpl.java b/src/main/java/com/kh/samdado/admin/model/service/AdminServiceImpl.java index e74d068d..aa2542f4 100644 --- a/src/main/java/com/kh/samdado/admin/model/service/AdminServiceImpl.java +++ b/src/main/java/com/kh/samdado/admin/model/service/AdminServiceImpl.java @@ -15,6 +15,7 @@ import com.kh.samdado.common.model.vo.Report; import com.kh.samdado.mypage.model.vo.Point; import com.kh.samdado.mypage.model.vo.QnA; +import com.kh.samdado.user.model.vo.User; @Service public class AdminServiceImpl implements AdminService { @@ -154,10 +155,16 @@ public List getPointList() { return aDao.getPointList(); } +// @Override +// public List selectGetProfit() { +// // TODO Auto-generated method stub +// return aDao.selectGetProfit(); +// } + @Override - public List selectGetProfit() { + public List selectGetUserData(User userType) { // TODO Auto-generated method stub - return aDao.selectGetProfit(); + return aDao.selectGetUserData(userType); } @Override @@ -202,6 +209,8 @@ public List selectGetAllProfit(Income profitRequestDto) { return aDao.selectGetAllProfit(profitRequestDto); } + + diff --git a/src/main/java/com/kh/samdado/admin/model/vo/A_board.java b/src/main/java/com/kh/samdado/admin/model/vo/A_board.java index b1a1ad31..dae0c5ed 100644 --- a/src/main/java/com/kh/samdado/admin/model/vo/A_board.java +++ b/src/main/java/com/kh/samdado/admin/model/vo/A_board.java @@ -30,5 +30,5 @@ public class A_board { private String bstatus; private String usno; private String uspart; - + private int usnews; } diff --git a/src/main/java/com/kh/samdado/business/controller/businessController.java b/src/main/java/com/kh/samdado/business/controller/businessController.java index 2d78dc5c..2f3c877f 100644 --- a/src/main/java/com/kh/samdado/business/controller/businessController.java +++ b/src/main/java/com/kh/samdado/business/controller/businessController.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; +import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -86,8 +87,19 @@ public String hotelDetail(@RequestParam int bus_code, List reviewList = bService.selectReview(bus_code); List alliance = bService.selectAlli(); + for(int i = 0; i < roomList.size(); i++) { + for(int j = 0; j < roomAtt.size(); j++) { + if(roomList.get(i).getRoom_no() == roomAtt.get(j).getRoom_no()) { + roomList.get(i).setFile_rename(roomAtt.get(j).getFile_rename()); + } + } + } + + //System.out.println("roomLKist: " + roomList.get(0).getFile_rename()); + //System.out.println("roomLKist: " + roomList.get(1).getFile_rename()); + if(b != null && roomList != null) { - //System.out.println("호텔사진 : " + attList); + //System.out.println("roomAtt : " + roomAtt); model.addAttribute("hotel", b); model.addAttribute("att", attList); model.addAttribute("room", roomList); @@ -103,11 +115,11 @@ public String hotelDetail(@RequestParam int bus_code, int useridx = Integer.parseInt(loginUser.getUsno()); idxMap.put("bbsidx", bbsidx); idxMap.put("useridx", useridx); - System.out.println("idxMap : " + idxMap); + //System.out.println("idxMap : " + idxMap); //jjim 테이블 에서 찜하기유무 확인하기 Map jjimcheckMap = bService.jjimcheck(idxMap); - System.out.println("jjimcheckMap : " + jjimcheckMap); + //System.out.println("jjimcheckMap : " + jjimcheckMap); //찜 누른 기록이 없다면 if(jjimcheckMap == null) { model.addAttribute("jjimcheck",0); @@ -134,7 +146,7 @@ public String hotelInsert() { // 호텔등록 @PostMapping("/hotel_insert") - public String hotelInsert(Business b, Room r, RoomList rl, Income i, BusinessAtt bat, @RequestParam int primonth, + public String hotelInsert(Business b, Room r, RoomList rl, Income i, BusinessAtt bat, @RequestParam String primonth, @RequestParam(value = "uploadFile") List rfile, @RequestParam(value = "room") List roomFile, @RequestParam(value = "mainFile") MultipartFile mainFile, @@ -226,14 +238,14 @@ public String hotelInsert(Business b, Room r, RoomList rl, Income i, BusinessAtt } } - if(primonth != 0) { + if(primonth != null) { // 넘어온 개월수에 따라 amount값 주기 - if(primonth == 30) { - i.setAmount(70); - } else if(primonth == 90) { - i.setAmount(90); + if(primonth == "30") { + i.setAmount(30000); + } else if(primonth == "90") { + i.setAmount(50000); } else { - i.setAmount(180); + i.setAmount(90000); } int result3 = bService.insertIncome1(i); } @@ -322,7 +334,17 @@ public ModelAndView hotelList(ModelAndView mv) { } List hotelList = bService.selectHotelList(); - + List reviewList = bService.selectReviewList(); + for(Business t : hotelList) { + for(Review r : reviewList) { + if(t.getBus_code() == r.getBus_code()) { + t.setAvstar(r.getAvstar()); + t.setRevcnt(r.getRevcnt()); + } + } + } + + if(hotelList != null) { mv.addObject("hotelList", hotelList); mv.setViewName("business/hotel/hotel_list"); @@ -532,6 +554,15 @@ public ModelAndView tourList(ModelAndView mv) { } List tourList = bService.selectTourList(); + List reviewList = bService.selectReviewList(); + for(Business t : tourList) { + for(Review r : reviewList) { + if(t.getBus_code() == r.getBus_code()) { + t.setAvstar(r.getAvstar()); + t.setRevcnt(r.getRevcnt()); + } + } + } if(tourList != null) { @@ -780,7 +811,15 @@ public ModelAndView resList(ModelAndView mv) { } List resList = bService.selectResList(); - //System.out.println(resList); + List reviewList = bService.selectReviewList(); + for(Business t : resList) { + for(Review r : reviewList) { + if(t.getBus_code() == r.getBus_code()) { + t.setAvstar(r.getAvstar()); + t.setRevcnt(r.getRevcnt()); + } + } + } if(resList != null) { mv.addObject("resList", resList); mv.setViewName("business/restaurant/restaurant_list"); @@ -801,6 +840,20 @@ public String carDetail(@RequestParam int bus_code, List carAtt = bService.selectCarAtt(bus_code); List reviewList = bService.selectReview(bus_code); List alliance = bService.selectAlli(); + + //System.out.println(carList.get(0).getCar_no()); + //System.out.println(carAtt.get(0).getCar_no()); + //System.out.println(carList); + //System.out.println(carAtt); + for(int i = 0; i < carList.size(); i++) { + for(int j = 0; j < carAtt.size(); j++) { + if(carList.get(i).getCar_no() == carAtt.get(j).getCar_no()) { + carList.get(i).setFile_rename(carAtt.get(j).getFile_rename()); + } + } + } + System.out.println(carList.get(0).getFile_rename()); + if(b != null) { model.addAttribute("car", b); @@ -1033,7 +1086,15 @@ public ModelAndView carList(ModelAndView mv) { } List carList = bService.selectCarList(); - + List reviewList = bService.selectReviewList(); + for(Business t : carList) { + for(Review r : reviewList) { + if(t.getBus_code() == r.getBus_code()) { + t.setAvstar(r.getAvstar()); + t.setRevcnt(r.getRevcnt()); + } + } + } if(carList != null) { mv.addObject("carList", carList); mv.setViewName("business/rentcar/car_list"); @@ -1044,10 +1105,10 @@ public ModelAndView carList(ModelAndView mv) { // 예약결제 성공 시 insert @GetMapping("/pay") - public String payBtn(@ModelAttribute Income i, @ModelAttribute Booking b, @ModelAttribute Point p, int bus_code) { + public String payBtn(@ModelAttribute Income i, @ModelAttribute Booking b, @ModelAttribute Point p, int bus_code, User u) { // 포인트에 amount 넣어주기 - p.setPamount(i.getAmount()); + p.setPamount(i.getAmount() * 9/10); // income에 들어갈 원가 10퍼센트 셋팅 i.setAmount(i.getAmount() * 1/10); @@ -1068,7 +1129,12 @@ public String payBtn(@ModelAttribute Income i, @ModelAttribute Booking b, @Model p.setPbalance(i.getAmount() * 9); } // 포인트 넣기 - int point = bService.insertPoint(p); + int point = bService.insertPoint(p); + + // User테이블 pbalance에 추가하기 + u.setUsno(selectUser.getUs_no()); + u.setPbalance(p.getPbalance()); + int userPbalance = bService.updateUserPblance(u); // 예약정보 insert if(b.getBookingLv() == 1) { @@ -1094,22 +1160,41 @@ public String payBtn(@ModelAttribute Income i, @ModelAttribute Booking b, @Model } + @RequestMapping(value="rescateList", method=RequestMethod.POST) + @ResponseBody + public List rescateList(HttpServletResponse response, @RequestParam String kinds) { + + + String kind = kinds.substring(kinds.lastIndexOf("=")+1); + List rescateList = bService.rescateList(kind); + return rescateList; + + } @RequestMapping(value="cateList", method=RequestMethod.POST) @ResponseBody - public List cateList(HttpServletResponse response, @RequestBody String kinds) { + public List cateList(HttpServletResponse response, @RequestParam String kinds) { + String kind = kinds.substring(kinds.lastIndexOf("=")+1); List cateList = bService.cateList(kind); - - //System.out.println("cateList : " + cateList.size()); return cateList; } + @RequestMapping(value="facList", method=RequestMethod.POST) + @ResponseBody + public List facList(HttpServletResponse response, @RequestParam String kinds) { + + String kind = kinds.substring(kinds.lastIndexOf("=")+1); + List facList = bService.facList(kind); + return facList; + + } + @RequestMapping(value="calList", method=RequestMethod.POST) @ResponseBody - public List calList(HttpServletResponse response, @RequestBody String kinds) { + public List calList(HttpServletResponse response, @RequestParam String kinds) { String kind = kinds.substring(kinds.lastIndexOf("=")+1); List calList = bService.calList(kind); @@ -1118,12 +1203,45 @@ public List calList(HttpServletResponse response, @RequestBody String } - @RequestMapping("/priceList") + @RequestMapping(value="starList", method=RequestMethod.POST) + @ResponseBody + public List starList(HttpServletResponse response, @RequestParam String kinds) { + + List starList = bService.starList(); + //System.out.println(starList); + return starList; + + } + @RequestMapping(value="starList2", method=RequestMethod.POST) + @ResponseBody + public List starList2(HttpServletResponse response, @RequestParam String kinds) { + + List starList2 = bService.starList2(); + //System.out.println(starList); + return starList2; + + } + + @RequestMapping(value="reviewList", method=RequestMethod.POST) + @ResponseBody + public List reviewList(HttpServletResponse response, @RequestParam String kinds) { + + List reviewList = bService.reviewList(); + + return reviewList; + + } + + @RequestMapping(value="reviewList2", method=RequestMethod.POST) @ResponseBody - public List priceList(HttpServletResponse response, @RequestBody Business kinds) { - List priceList = bService.priceList(kinds); - return priceList; + public List reviewList2(HttpServletResponse response, @RequestParam String kinds) { + + List reviewList2 = bService.reviewList2(); + + return reviewList2; + } + //찜하기 ajax받기 @RequestMapping("/jjim") @ResponseBody @@ -1263,7 +1381,7 @@ public String saveFile(MultipartFile file, HttpServletRequest request) { try { file.transferTo(new File(renamePath)); } catch (IllegalStateException | IOException e) { - System.out.println("파일 업로드 에러 : " + e.getMessage()); + //System.out.println("파일 업로드 에러 : " + e.getMessage()); } return renameFileName; @@ -1516,7 +1634,7 @@ public Map busSaveFile(MultipartFile file, HttpServletRequest re file.transferTo(new File(renamePath)); // => 업로드 된 파일 (MultipartFile) 이 rename명으로 서버에 저장 } catch (IllegalStateException | IOException e) { - System.out.println("파일 업로드 에러 : " + e.getMessage()); + //System.out.println("파일 업로드 에러 : " + e.getMessage()); } return map; diff --git a/src/main/java/com/kh/samdado/business/model/dao/businessDao.java b/src/main/java/com/kh/samdado/business/model/dao/businessDao.java index 10b4d67a..b875feaa 100644 --- a/src/main/java/com/kh/samdado/business/model/dao/businessDao.java +++ b/src/main/java/com/kh/samdado/business/model/dao/businessDao.java @@ -51,6 +51,8 @@ public interface businessDao { int insertRoom(List rooms); // 호텔리스트 List selectHotelList(); + + List selectHotelListP(); // 호텔디테일 Business selectHotel(int bus_code); @@ -134,6 +136,8 @@ public interface businessDao { int insertPoint(Point p); public Point findPoint(Point p); + + int updateUserPblance(User u); // 비즈니스 등록 폼, 본인이 등록한 사업장 셀렉 List selectMyBusinessCategory(User loginUser); @@ -181,6 +185,22 @@ public interface businessDao { List selectAlli(); + List selectReviewList(); + + List starList(); + List starList2(); + + List reviewList(); + List reviewList2(); + + List facList(String kind); + + List rescateList(String kind); + + + + + diff --git a/src/main/java/com/kh/samdado/business/model/dao/businessDaoImpl.java b/src/main/java/com/kh/samdado/business/model/dao/businessDaoImpl.java index 2b6aae4d..b7786db2 100644 --- a/src/main/java/com/kh/samdado/business/model/dao/businessDaoImpl.java +++ b/src/main/java/com/kh/samdado/business/model/dao/businessDaoImpl.java @@ -110,6 +110,12 @@ public int insertRoom(List rooms) { public List selectHotelList() { return sqlSession.selectList("businessMapper.selectHotelList"); } + + @Override + public List selectHotelListP() { + return sqlSession.selectList("businessMapper.selectHotelListP"); + } + // 호텔디테일 @Override public Business selectHotel(int bus_code) { @@ -254,6 +260,11 @@ public int insertPoint(Point p) { public Point findPoint(Point p) { return sqlSession.selectOne("businessMapper.findPoint", p); } + + @Override + public int updateUserPblance(User u) { + return sqlSession.update("businessMapper.updateUserPblance", u); + } @Override public List businessSearch() { @@ -424,6 +435,50 @@ public List selectAlli() { return sqlSession.selectList("businessMapper.selectAlli"); } + @Override + public List selectReviewList() { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.selectReviewList"); + } + + @Override + public List starList() { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.starList"); + } + @Override + public List starList2() { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.starList2"); + } + + @Override + public List reviewList() { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.reviewList"); + } + @Override + public List reviewList2( ) { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.reviewList2"); + } + + @Override + public List facList(String kind) { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.facList", kind); + } + + @Override + public List rescateList(String kind) { + // TODO Auto-generated method stub + return sqlSession.selectList("businessMapper.rescateList", kind); + } + + + + + diff --git a/src/main/java/com/kh/samdado/business/model/service/businessService.java b/src/main/java/com/kh/samdado/business/model/service/businessService.java index c1b49563..aac7082c 100644 --- a/src/main/java/com/kh/samdado/business/model/service/businessService.java +++ b/src/main/java/com/kh/samdado/business/model/service/businessService.java @@ -53,6 +53,8 @@ public interface businessService { int insertRoom(List rooms); // 호텔리스트 List selectHotelList(); + + List selectHotelListP(); // 호텔디테일 Business selectHotel(int bus_code); @@ -135,6 +137,8 @@ public interface businessService { int insertPoint(Point p); public Point findPoint(Point p); + + int updateUserPblance(User u); // 배너 광고 등록 폼, 본인 사업장 가져오기 List selectMyBusinessCategory(User loginUser); @@ -175,6 +179,22 @@ public interface businessService { List selectAlli(); + List selectReviewList(); + + List starList(); + List starList2(); + + List reviewList(); + List reviewList2(); + + List facList(String kind); + + List rescateList(String kind); + + + + + diff --git a/src/main/java/com/kh/samdado/business/model/service/businessServiceImpl.java b/src/main/java/com/kh/samdado/business/model/service/businessServiceImpl.java index 12ebaacb..6c1d006c 100644 --- a/src/main/java/com/kh/samdado/business/model/service/businessServiceImpl.java +++ b/src/main/java/com/kh/samdado/business/model/service/businessServiceImpl.java @@ -96,6 +96,11 @@ public int insertRoom(List rooms) { public List selectHotelList() { return bDao.selectHotelList(); } + // 호텔프리미엄리스트 + @Override + public List selectHotelListP() { + return bDao.selectHotelListP(); + } // 호텔디테일 @Override public Business selectHotel(int bus_code) { @@ -250,6 +255,11 @@ public Point findPoint(Point p) { // TODO Auto-generated method stub return bDao.findPoint(p); } + + @Override + public int updateUserPblance(User u) { + return bDao.updateUserPblance(u); + } // 지혜 @Override @@ -399,6 +409,50 @@ public List selectAlli() { return bDao.selectAlli(); } + @Override + public List selectReviewList() { + // TODO Auto-generated method stub + return bDao.selectReviewList(); + } + + @Override + public List starList() { + // TODO Auto-generated method stub + return bDao.starList(); + } + @Override + public List starList2() { + // TODO Auto-generated method stub + return bDao.starList2(); + } + + @Override + public List reviewList() { + // TODO Auto-generated method stub + return bDao.reviewList(); + } + @Override + public List reviewList2() { + // TODO Auto-generated method stub + return bDao.reviewList2(); + } + + @Override + public List facList(String kind) { + // TODO Auto-generated method stub + return bDao.facList(kind); + } + + @Override + public List rescateList(String kind) { + // TODO Auto-generated method stub + return bDao.rescateList(kind); + } + + + + + diff --git a/src/main/java/com/kh/samdado/business/model/vo/Jjim.java b/src/main/java/com/kh/samdado/business/model/vo/Jjim.java index 7472e5cb..20138503 100644 --- a/src/main/java/com/kh/samdado/business/model/vo/Jjim.java +++ b/src/main/java/com/kh/samdado/business/model/vo/Jjim.java @@ -49,6 +49,7 @@ public class Jjim { private String bus_opening; private String hotel_facility; private String usname; // user 테이블 조인 + private String avstar; //BUSINNESS_ATT JOINs private String file_rename; // 리네임 diff --git a/src/main/java/com/kh/samdado/business/model/vo/Review.java b/src/main/java/com/kh/samdado/business/model/vo/Review.java index c11fd2de..ee105389 100644 --- a/src/main/java/com/kh/samdado/business/model/vo/Review.java +++ b/src/main/java/com/kh/samdado/business/model/vo/Review.java @@ -50,6 +50,9 @@ US_NO VARCHAR2(15 BYTE) private String re_star; private String rev_hct; // h이냐 t이냐 c이냐 + private String avstar; + private String revcnt; + private int c_booking_no; private String c_bus_name; private String c_booking_product; @@ -62,6 +65,7 @@ US_NO VARCHAR2(15 BYTE) private Date c_booking_trv; private int rent_no; private int c_bus_code; + private Date c_booking_trvEnd; private int r_booking_no; private String r_bus_name; @@ -75,6 +79,7 @@ US_NO VARCHAR2(15 BYTE) private Date r_booking_trv; private int room_no; private int r_bus_code; + private Date r_booking_trvEnd; private int t_booking_no; // 예약번호 private String t_bus_name; // 사업장이름 @@ -124,4 +129,6 @@ US_NO VARCHAR2(15 BYTE) private int booking_no; private String us_name; + + } diff --git a/src/main/java/com/kh/samdado/business/model/vo/business/Business.java b/src/main/java/com/kh/samdado/business/model/vo/business/Business.java index 72811d0d..18645ffd 100644 --- a/src/main/java/com/kh/samdado/business/model/vo/business/Business.java +++ b/src/main/java/com/kh/samdado/business/model/vo/business/Business.java @@ -92,5 +92,10 @@ public class Business { // 신고기록 조인 private Date rexdate; private int ref_bus_code; + + private String avstar; + private String revcnt; + private int avgstar; + private String recnt; } diff --git a/src/main/java/com/kh/samdado/business/model/vo/hotel/Room.java b/src/main/java/com/kh/samdado/business/model/vo/hotel/Room.java index 33aede7b..2039a659 100644 --- a/src/main/java/com/kh/samdado/business/model/vo/hotel/Room.java +++ b/src/main/java/com/kh/samdado/business/model/vo/hotel/Room.java @@ -48,5 +48,6 @@ public class Room { private String room_amenity; private String room_state; private List roomAtt; + private String file_rename; } diff --git a/src/main/java/com/kh/samdado/business/model/vo/rentcar/Car.java b/src/main/java/com/kh/samdado/business/model/vo/rentcar/Car.java index d4c61e18..302f3349 100644 --- a/src/main/java/com/kh/samdado/business/model/vo/rentcar/Car.java +++ b/src/main/java/com/kh/samdado/business/model/vo/rentcar/Car.java @@ -41,5 +41,6 @@ public class Car { private Date car_date; private Date car_modify; private List carList; + private String file_rename; } diff --git a/src/main/java/com/kh/samdado/mypage/controller/MypageController.java b/src/main/java/com/kh/samdado/mypage/controller/MypageController.java index 83721daa..e962d3f2 100644 --- a/src/main/java/com/kh/samdado/mypage/controller/MypageController.java +++ b/src/main/java/com/kh/samdado/mypage/controller/MypageController.java @@ -11,7 +11,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javax.websocket.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -29,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.kh.samdado.admin.model.vo.A_board; import com.kh.samdado.business.model.vo.Jjim; import com.kh.samdado.business.model.vo.Review; import com.kh.samdado.business.model.vo.business.Business; @@ -40,6 +40,7 @@ import com.kh.samdado.mypage.model.vo.ApplyPageInfo; import com.kh.samdado.mypage.model.vo.ApplyPagination; import com.kh.samdado.mypage.model.vo.Booking; +import com.kh.samdado.mypage.model.vo.MpBoardPagination; import com.kh.samdado.mypage.model.vo.Point; import com.kh.samdado.mypage.model.vo.QnA; import com.kh.samdado.mypage.model.vo.RouteMP; @@ -71,10 +72,36 @@ public int findNew(@RequestBody User u){ // --은솔 : 새로운 알림 있는지 확인하기 int newNews = mService.findNewNews(u); //System.out.println("mpcontroller newNews : " + newNews); + //int newBoardNews = mService.findNewUserNews(u); + int userNews = u.getUsnews(); + + //System.out.println(newNews); + //System.out.println(userNews); + + + if(newNews > 0 || userNews > 0) { + return 1; + } else { + return 0; + } + + + } + + @RequestMapping("/usernew") + @ResponseBody + public int findNewAlert(@RequestBody User u){ + + //System.out.println("User확인 : " + u); + // --은솔 : 새로운 알림 있는지 확인하기 + //int newNews = mService.findNewUserNews(u); + //System.out.println("mpcontroller newNews : " + newNews); + int newNews = u.getUsnews(); return newNews; } + // 제휴회원 마이페이지로 이동 @GetMapping("/buserinfo") public String mypageBuserFirstView() { @@ -283,12 +310,14 @@ public String sendQnA(Model model, // 제휴회원 - 내 사업장 조회 메소드 @GetMapping("/buss") public ModelAndView selectBussList(@RequestParam(name="usno") String usno, - ModelAndView mv) { + ModelAndView mv, HttpSession session) { + User u = (User) session.getAttribute("loginUser"); + usno = u.getUsno(); // 해당 사용자가 등록한 사업장 리스트 알아오기 List bussList = mService.selectBussList(usno); - //System.out.println("bussList확인 : " + bussList); + System.out.println("bussList확인 : " + bussList); mv.addObject("bussList", bussList); mv.setViewName("mypage/mp_StoreList"); @@ -332,6 +361,7 @@ public ModelAndView selectAdvertList(ModelAndView mv, List chartDataList = mService.selectAlliChartList(usno); //System.out.println(chartDataList); + mv.addObject("api", api); mv.addObject("allList", allList); mv.addObject("applyList", applyList); @@ -351,12 +381,23 @@ public ModelAndView selectAlertList(ModelAndView mv, User u = (User) session.getAttribute("loginUser"); + // 공지사항 갯수 구하기 + int boardListCount = mService.selectBoardListCount(u.getUspart()); + //System.out.println("공지사항 전체 글 갯수 확인 : " + boardListCount); + + // 요청 페이지에 맞는 게시글 리스트 조회 + ApplyPageInfo api = MpBoardPagination.getApplyPageInfo(currentPage, boardListCount); + // DB에서 가져와야 할 알림 내역들 : 문의하기, 신고 받은 내역, 포인트 충전 알림, 배너광고 신청, 승인, 반려(사유), 포인트 얼마 안남음 // 안읽은 리스트 List alertNList = mService.selectAlertList(u); // 읽은 리스트 List alertYList = mService.selectYAlertList(u); + // 공지사항 + List alertBoard = mService.selectBoard(u, api); + mv.addObject("api", api); + mv.addObject("alertBoard", alertBoard); mv.addObject("alertNList", alertNList); mv.addObject("alertYList", alertYList); mv.setViewName("mypage/mp_news"); @@ -377,6 +418,7 @@ public List selectNewAlertList(@RequestBody User user, // 읽은 리스트 List alertYList = mService.selectYAlertList(u); + // 두개의 리스트 합치기 List newDataList = new ArrayList<>(); @@ -385,7 +427,7 @@ public List selectNewAlertList(@RequestBody User user, newDataList.addAll(alertNList); newDataList.addAll(alertYList); - //System.out.println(newDataList); + System.out.println(newDataList); return newDataList; @@ -404,8 +446,8 @@ public Alert findDetailNews(@RequestBody Alert al) { // 2. 읽음으로 처리해주기 int result = mService.updateNstatus(al); - - if(deAlert != null) { + System.out.println(result); + if(deAlert != null && result > 0) { return deAlert; } else { return null; @@ -424,17 +466,10 @@ public ModelAndView mypageUserFirstView(ModelAndView mv, //System.out.println(user); - List alertNList = mService.selectAlertList(user); - // 읽은 리스트 - List alertYList = mService.selectYAlertList(user); + // 공지사항 + List alertBoard = mService.selectUserBoard(user); - //System.out.println(alertNList); - //System.out.println(alertYList); - - mv.addObject("alertNList", alertNList); - mv.addObject("alertYList", alertYList); - //mv.addObject("usno", user.getUsno()); - //mv.addObject("uspart",user.getUspart()); + mv.addObject("alertBoard", alertBoard); mv.setViewName("mypage/mp_UserInfo"); return mv; } @@ -453,7 +488,7 @@ public String updatePwd(@ModelAttribute User u, //System.out.println("change안에서 u : " + u); User loginUser = uService.loginUser(u); - + List alertBoard = null; if(bcryptPasswordEncoder.matches(cPwd, loginUser.getUspwd())) { // 4) 비밀번호 변경 값 받아서 암호화 @@ -463,26 +498,29 @@ public String updatePwd(@ModelAttribute User u, // 5) db에 update 후 int result = uService.updatePwdUser(u); // 암호화 한 비번 db에 update u.setUspart("일반"); - List alertNList = mService.selectAlertList(u); - // 읽은 리스트 - List alertYList = mService.selectYAlertList(u); + + User user = (User) session.getAttribute("loginUser"); + + //System.out.println(user); + + // 공지사항 + alertBoard = mService.selectUserBoard(user); + //System.out.println(alertBoard); + // 6) 마이페이지로 돌아가기 if (result > 0) { - model.addAttribute("alertNList", alertNList); - model.addAttribute("alertYList", alertYList); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "비밀번호가 수정되었습니다."); return "/mypage/mp_UserInfo"; } else { - model.addAttribute("alertNList", alertNList); - model.addAttribute("alertYList", alertYList); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "비밀번호 변경에 실패하였습니다. 다시 시도해주세요."); return "/mypage/mp_UserInfo"; } } else { - model.addAttribute("usno", u.getUsno()); - model.addAttribute("uspart", u.getUspart()); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "현재 비밀번호가 틀립니다."); return "/mypage/mp_UserInfo"; } @@ -520,21 +558,21 @@ public String updateInfo(@ModelAttribute("loginUser") User u, //변경 값 다시 loginUser에 넣어주기 User loginUser = uService.loginUser(u); - - //System.out.println("loginUser가 변경 되었는지 확인해보쟈 : " + loginUser); - u.setUspart("일반"); - List alertNList = mService.selectAlertList(u); - // 읽은 리스트 - List alertYList = mService.selectYAlertList(u); + + List alertBoard = null; + User user = (User) session.getAttribute("loginUser"); + + //System.out.println(user); + + // 공지사항 + alertBoard = mService.selectUserBoard(user); if (result > 0) { - model.addAttribute("alertNList", alertNList); - model.addAttribute("alertYList", alertYList); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "수정이 완료되었습니다!"); return "/mypage/mp_UserInfo"; } else { - model.addAttribute("alertNList", alertNList); - model.addAttribute("alertYList", alertYList); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "수정에 실패했습니다. 다시 시도해주세요."); return "/mypage/mp_UserInfo"; } @@ -545,17 +583,74 @@ public String updateInfo(@ModelAttribute("loginUser") User u, // 일반회원 - 내예약목록 페이지 이동 @GetMapping("/booking") public ModelAndView goToBooking(@ModelAttribute User u, - ModelAndView mv) { + ModelAndView mv, HttpSession session) { + + //System.out.println(u); //System.out.println("usno1 : " + u.getUsno()); +// User user = (User)session.getAttribute("loginUser"); +// String u = user.getUsno(); + List hotelBookList = mService.selectHotelBookList(u.getUsno()); List tourBookList = mService.selectTourBookList(u.getUsno()); List carBookList = mService.selectCarBookList(u.getUsno()); +// if(hotelBookList != null && tourBookList != null && carBookList != null) { +// mv.addObject("hotelList", hotelBookList); +// mv.addObject("tourList", tourBookList); +// mv.addObject("carList", carBookList); +// } else if(hotelBookList != null) { +// if(tourBookList != null && carBookList != null) { +// mv.addObject("hotelList", hotelBookList); +// } +// } + +// if(hotelBookList != null) { +// if(tourBookList != null) { +// if( carBookList != null) { +// mv.addObject("hotelList", hotelBookList); +// mv.addObject("tourList", tourBookList); +// mv.addObject("carList", carBookList); +// } else { +// mv.addObject("hotelList", hotelBookList); +// mv.addObject("tourList", tourBookList); +// } +// } else if(tourBookList == null){ +// if(carBookList != null) { +// mv.addObject("hotelList", hotelBookList); +// mv.addObject("carList", carBookList); +// } else { +// mv.addObject("hotelList", hotelBookList); +// } +// +// } +// } else if(hotelBookList == null) { +// if(tourBookList != null) { +// if( carBookList != null) { +// mv.addObject("tourList", tourBookList); +// mv.addObject("carList", carBookList); +// } else { +// mv.addObject("hotelList", hotelBookList); +// mv.addObject("tourList", tourBookList); +// } +// } else if(tourBookList == null){ +// if(carBookList != null) { +// mv.addObject("hotelList", hotelBookList); +// mv.addObject("carList", carBookList); +// } else { +// mv.addObject("hotelList", hotelBookList); +// } +// +// } +// } + + //System.out.println(hotelBookList); + //System.out.println(tourBookList); + //System.out.println(carBookList); + mv.addObject("hotelList", hotelBookList); mv.addObject("tourList", tourBookList); mv.addObject("carList", carBookList); - mv.setViewName("/mypage/mp_MyReservation"); return mv; } @@ -783,7 +878,10 @@ public String writeReview(@ModelAttribute() Review r, @RequestParam( value = "re_star", required=false, defaultValue="0.5") String re_star, @RequestParam( value = "inup", required=false) String inup, HttpServletRequest request, Model model ) { -// System.out.println(file1); + + //System.out.println(r); + + // System.out.println(file1); // System.out.println(file2); // //System.out.println(file3); r.setRe_star(re_star); @@ -851,7 +949,10 @@ public String writeReview(@ModelAttribute() Review r, } - if(result > 0 && result2 == 1) { + // 후기 작성이 끝나면 해당 비즈니스 별점 계산해서 넣어주기 + int afterStar = mService.updateBusStar(r); + + if(result > 0 && result2 == 1 && afterStar > 0) { model.addAttribute("usno", r.getUs_no()); model.addAttribute("msg", "후기가 성공적으로 게시되었습니다!"); return "redirect:/mypage/booking"; @@ -869,7 +970,7 @@ public Review rewriteReview(@RequestBody Review r) { //System.out.println("가기전에 r 확인 : " + r); Review reviewDetail = mService.selectReview(r); - //System.out.println("reviewDetail 확인 : " + reviewDetail); + System.out.println("reviewDetail 확인 : " + reviewDetail); return reviewDetail; @@ -907,7 +1008,7 @@ public String toggleJjimOn(@RequestBody Jjim j) { @ResponseBody public String toggleJjimOff(@RequestBody Jjim j) { - System.out.println(j); + //System.out.println(j); int result = mService.deleteJjim(j); if(result >0) @@ -937,7 +1038,7 @@ public ModelAndView goToMyroute(ModelAndView mv, Map map, HttpSession session) { // 이 회원이 가지고 있는 모든 경로의 모든 관광지 리스트 List myRouteList = mService.selectMyRoute(u); - System.out.println("myRoute확인 : " + myRouteList); + //System.out.println("myRoute확인 : " + myRouteList); // 이 회원이 가지고 있는 경로 수 List routeNumber = mService.selectRouteNum(u); @@ -972,7 +1073,7 @@ public ModelAndView goToMyroute(ModelAndView mv, Map map, HttpSession session) { routeTest.put(mapKey, insertThis); forIndex = forIndex + standardList[b]; mapKey ++; - //System.out.println("routeTest["+b+"] : " + routeTest.get(b)); + System.out.println("routeTest["+b+"] : " + routeTest.get(b)); } mv.addObject("routeTest", routeTest); @@ -987,17 +1088,19 @@ public ModelAndView goToMyroute(ModelAndView mv, Map map, HttpSession session) { // 회원 탈퇴 @PostMapping("/userout") - public String memberOut(@ModelAttribute User u, Model model) { + public String memberOut(@ModelAttribute User u, Model model, HttpSession session) { ////System.out.println("out u : " + u); //System.out.println(memoutPwd); User loginUser = uService.loginUser(u); //System.out.println("out loginUser" + loginUser); - - List alertNList = mService.selectAlertList(u); - // 읽은 리스트 - List alertYList = mService.selectYAlertList(u); - + User user = (User) session.getAttribute("loginUser"); + + //System.out.println(user); + + // 공지사항 + List alertBoard = mService.selectUserBoard(user); + if(bcryptPasswordEncoder.matches(u.getUspwd(), loginUser.getUspwd())) { @@ -1009,8 +1112,7 @@ public String memberOut(@ModelAttribute User u, Model model) { return "redirect:/main"; } else { if(u.getUspart() == "일반") { - model.addAttribute("alertNList", alertNList); - model.addAttribute("alertYList", alertYList); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "문제가 발생했습니다. 잠시 후에 다시 시도해 주세요!"); return "/mypage/mp_UserInfo"; } else { @@ -1021,8 +1123,7 @@ public String memberOut(@ModelAttribute User u, Model model) { } } else { if(u.getUspart() == "일반") { - model.addAttribute("alertNList", alertNList); - model.addAttribute("alertYList", alertYList); + model.addAttribute("alertBoard", alertBoard); model.addAttribute("msg", "문제가 발생했습니다. 잠시 후에 다시 시도해 주세요!"); return "/mypage/mp_UserInfo"; } else { @@ -1059,4 +1160,24 @@ public String saveFile(MultipartFile file, HttpServletRequest request) { return renameFileName; } + // 공지사항 디테일 가져오기 + @RequestMapping("/alertboardajax") + @ResponseBody + public A_board findBoardAjax(@RequestBody A_board aboard) { + //System.out.println("aboard 확인 : " + aboard); + A_board ab = mService.findThisBoard(aboard); + + int result = 0; + + if(aboard.getUsnews() > 0) { + result = mService.updateUserRead(aboard); + } + + if(ab != null && result > 0) { + return ab; + } else { + return ab; + } + + } } diff --git a/src/main/java/com/kh/samdado/mypage/model/dao/MypageDao.java b/src/main/java/com/kh/samdado/mypage/model/dao/MypageDao.java index 3b4aed18..9b646cc3 100644 --- a/src/main/java/com/kh/samdado/mypage/model/dao/MypageDao.java +++ b/src/main/java/com/kh/samdado/mypage/model/dao/MypageDao.java @@ -192,4 +192,28 @@ public interface MypageDao { // 길찾기 내 찜하기 public List findHotelJjimList(User u); + // 후기 작성 후 비즈니스에 별점 update + public int updateBusStar(Review r); + + // 공지사항 등록 시 해당 user의 news +1 해주기 + public int updateNewUserNews(A_board aboard); + + // 내소식에 들어갈 공지사항 리스트 + public List selectBoard(User u, ApplyPageInfo api); + + // 특정 공지사항 가져오기 + public A_board findThisBoard(A_board aboard); + + // 일반회원 새로운 공지사항 있는지 확인 + public int findNewUserNews(User u); + + // 공지사항 읽으면 user -1 해주기 + public int updateUserRead(A_board aboard); + + // 공지사항 갯수 구하기 + public int selectBoardListCout(String uspart); + + // 일반회원 공지사항 가져오기 + public List selectUserBoard(User user); + } diff --git a/src/main/java/com/kh/samdado/mypage/model/dao/MypageDaoImpl.java b/src/main/java/com/kh/samdado/mypage/model/dao/MypageDaoImpl.java index c06b4ab2..d8594df4 100644 --- a/src/main/java/com/kh/samdado/mypage/model/dao/MypageDaoImpl.java +++ b/src/main/java/com/kh/samdado/mypage/model/dao/MypageDaoImpl.java @@ -56,6 +56,7 @@ public Alert selectDetailAlert(Alert al) { // 알림 nstatus update @Override public int updateNstatus(Alert al) { +// sqlSession.update("mypageMapper.updateUserRead",al.getUsno()); return sqlSession.update("mypageMapper.updateNstatus", al); } @@ -149,6 +150,7 @@ public List selectSearchList(SearchPoint sp) { // 제휴회원 - 사업장 조회 메소드 @Override public List selectBussList(String usno) { + System.out.println("bussList확인 : " + usno); return sqlSession.selectList("mypageMapper.selectBussList", usno); } @@ -209,6 +211,7 @@ public List selectChartList(AccountBook ab) { // 제휴회원 - QnA 새로운 알림 등록 @Override public int insertQnANews(Alert a) { + //sqlSession.update("mypageMapper.updateUserNewNews", a.getUsno()); return sqlSession.insert("mypageMapper.insertQnANews", a); } @@ -221,6 +224,7 @@ public int findAlno(Alliance a) { // 제휴회원 - Alliance 새로운 알림 등록 @Override public int insertAlliNews(Alert al) { + //sqlSession.update("mypageMapper.updateUserNewNews", al.getUsno()); return sqlSession.insert("mypageMapper.insertAlliNews", al); } @@ -233,6 +237,7 @@ public String findAlliUsno(Alliance alliance) { // 제휴회원 - Alliance 승인시 새로운 알림 등록 @Override public int insertNewApprove(Alert alert) { + //sqlSession.update("mypageMapper.updateUserNewNews", alert.getUsno()); return sqlSession.insert("mypageMapper.insertNewApprove", alert); } @@ -246,6 +251,7 @@ public int updatePbalance(Point po) { // 제휴회원 - Report 승인시 알림 등록 @Override public int insertNewReport(Alert a) { + //sqlSession.update("mypageMapper.updateUserNewNews", a.getUsno()); return sqlSession.insert("mypageMapper.insertNewReport", a); } @@ -270,7 +276,7 @@ public List selectCarBookList(String usno) { // 일반회원 - 내예약 취소 @Override public int deleteBooking(Booking b) { - System.out.println("dao까지는 잘 오니?"); + //System.out.println("dao까지는 잘 오니?"); return sqlSession.delete("mypageMapper.deleteBooking", b); } // 일반회원 - 후기등록 @@ -376,4 +382,54 @@ public List findHotelJjimList(User u) { return sqlSession.selectList("mypageMapper.findHotelJjimList", u); } + // 후기 작성 후 비즈니스에 별점 update + @Override + public int updateBusStar(Review r) { + return sqlSession.update("mypageMapper.updateBusStar", r); + } + + // 공지사항 등록 시 해당 user의 news +1 해주기 + @Override + public int updateNewUserNews(A_board aboard) { + return sqlSession.update("mypageMapper.updateNewUserNews", aboard); + } + + // 내소식에 들어갈 공지사항 리스트 + @Override + public List selectBoard(User u, ApplyPageInfo api) { + int offset = (api.getCurrentPage()-1) * api.getBoardLimit(); + RowBounds rowBounds = new RowBounds(offset, api.getBoardLimit()); + return sqlSession.selectList("mypageMapper.selectBoard", u, rowBounds); + } + + // 특정 공지사항 가져오기 + @Override + public A_board findThisBoard(A_board aboard) { + return sqlSession.selectOne("mypageMapper.findThisBoard", aboard); + } + + // 일반회원 새로운 공지사항 있는지 확인 + @Override + public int findNewUserNews(User u) { + return sqlSession.selectOne("mypageMapper.findNewUserNews", u); + } + + // 공지사항 읽으면 user -1 해주기 + @Override + public int updateUserRead(A_board aboard) { + return sqlSession.update("mypageMapper.updateUserRead", aboard); + } + + // 공지사항 갯수 구하기 + @Override + public int selectBoardListCout(String uspart) { + return sqlSession.selectOne("mypageMapper.selectBoardListCout", uspart); + } + + // 일반회원 공지사항 가져오기 + @Override + public List selectUserBoard(User user) { + return sqlSession.selectList("mypageMapper.selectBoard", user); + } + } diff --git a/src/main/java/com/kh/samdado/mypage/model/service/MypageService.java b/src/main/java/com/kh/samdado/mypage/model/service/MypageService.java index dc0c6ab2..782d78dc 100644 --- a/src/main/java/com/kh/samdado/mypage/model/service/MypageService.java +++ b/src/main/java/com/kh/samdado/mypage/model/service/MypageService.java @@ -192,5 +192,29 @@ public interface MypageService { // 길찾기 내 찜하기 public List findHotelJjimList(User u); + // 후기 작성 후 비즈니스에 별점 update + public int updateBusStar(Review r); + + // 공지사항 등록 시 해당 user의 news +1 해주기 + public int updateNewUserNews(A_board aboard); + + // 내소식에 들어갈 공지사항 리스트 + public List selectBoard(User u, ApplyPageInfo api); + + // 특정 공지사항 가져오기 + public A_board findThisBoard(A_board aboard); + + // 일반회원 새로운 공지사항 있는지 확인 + public int findNewUserNews(User u); + + // 공지사항 읽으면 user -1 해주기 + public int updateUserRead(A_board aboard); + + // 공지사항 갯수 구하기 + public int selectBoardListCount(String uspart); + + // 일반회원 공지사항 가져오기 + public List selectUserBoard(User user); + } diff --git a/src/main/java/com/kh/samdado/mypage/model/service/MypageServiceImpl.java b/src/main/java/com/kh/samdado/mypage/model/service/MypageServiceImpl.java index c3aced02..09c0de21 100644 --- a/src/main/java/com/kh/samdado/mypage/model/service/MypageServiceImpl.java +++ b/src/main/java/com/kh/samdado/mypage/model/service/MypageServiceImpl.java @@ -144,6 +144,7 @@ public List selectSearchList(SearchPoint sp) { // 제휴회원 - 사업장 조회 메소드 @Override public List selectBussList(String usno) { + System.out.println("bussList확인 : " + usno); return mDao.selectBussList(usno); } @@ -372,5 +373,53 @@ public List findHotelJjimList(User u) { return mDao.findHotelJjimList(u); } + // 후기 작성 후 비즈니스에 별점 update + @Override + public int updateBusStar(Review r) { + return mDao.updateBusStar(r); + } + + // 공지사항 등록 시 해당 user의 news +1 해주기 + @Override + public int updateNewUserNews(A_board aboard) { + return mDao.updateNewUserNews(aboard); + } + + // 내소식에 들어갈 공지사항 리스트 + @Override + public List selectBoard(User u,ApplyPageInfo api) { + return mDao.selectBoard(u, api); + } + + // 특정 공지사항 가져오기 + @Override + public A_board findThisBoard(A_board aboard) { + return mDao.findThisBoard(aboard); + } + + // 일반회원 새로운 공지사항 있는지 확인 + @Override + public int findNewUserNews(User u) { + return mDao.findNewUserNews(u); + } + + // 공지사항 읽으면 user -1 해주기 + @Override + public int updateUserRead(A_board aboard) { + return mDao.updateUserRead(aboard); + } + + // 공지사항 갯수 구하기 + @Override + public int selectBoardListCount(String uspart) { + return mDao.selectBoardListCout(uspart); + } + + // 일반회원 공지사항 가져오기 + @Override + public List selectUserBoard(User user) { + return mDao.selectUserBoard(user); + } + } diff --git a/src/main/java/com/kh/samdado/mypage/model/vo/MpBoardPagination.java b/src/main/java/com/kh/samdado/mypage/model/vo/MpBoardPagination.java new file mode 100644 index 00000000..3553f85c --- /dev/null +++ b/src/main/java/com/kh/samdado/mypage/model/vo/MpBoardPagination.java @@ -0,0 +1,24 @@ +package com.kh.samdado.mypage.model.vo; + +public class MpBoardPagination { + // PageInfo 객체를 리턴하는 static 메소드 + public static ApplyPageInfo getApplyPageInfo(int currentPage, int listCount) { + ApplyPageInfo api = null; // 페이지 정보를 담아 줄 PageInfo 참조변수 선언 + + int pageLimit = 3; // 한 페이지에 보여질 페이징바의 갯수 + int boardLimit = 2; // 한 페이지 보여질 게시글 개수 + + int maxPage = (int)Math.ceil((double)listCount / boardLimit); + int startPage = (currentPage - 1) / pageLimit * pageLimit + 1; + int endPage = startPage + pageLimit - 1; + + // 마지막 페이지가 총 페이지 수보다 클 경우 + if(maxPage < endPage) { + endPage = maxPage; + } + + api = new ApplyPageInfo(currentPage, listCount, pageLimit, maxPage, startPage, endPage, boardLimit); + + return api; + } +} diff --git a/src/main/java/com/kh/samdado/route/controller/RouteController.java b/src/main/java/com/kh/samdado/route/controller/RouteController.java index 000cfee0..6389253e 100644 --- a/src/main/java/com/kh/samdado/route/controller/RouteController.java +++ b/src/main/java/com/kh/samdado/route/controller/RouteController.java @@ -1,11 +1,9 @@ package com.kh.samdado.route.controller; import java.sql.Date; +import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpSession; @@ -19,7 +17,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.SessionAttributes; +import org.springframework.web.servlet.ModelAndView; +import com.kh.samdado.business.model.service.businessService; import com.kh.samdado.business.model.vo.business.Business; import com.kh.samdado.mypage.model.service.MypageService; import com.kh.samdado.route.model.exception.RouteException; @@ -27,7 +27,6 @@ import com.kh.samdado.route.model.vo.Route; import com.kh.samdado.route.model.vo.RouteFinal; import com.kh.samdado.route.model.vo.SpotBus; -import com.kh.samdado.route.model.vo.TourSpot; import com.kh.samdado.route.model.vo.rSearch; import com.kh.samdado.user.model.vo.User; @@ -41,27 +40,40 @@ public class RouteController { @Autowired private MypageService mService; + @Autowired + private businessService bService; + @GetMapping("/m_route") // 길 만들기 페이지로 이동 public String route() { return "route/route_main"; } @GetMapping("/search") - public String searchRoute(Model model, + public ModelAndView searchRoute(Model model, HttpSession session, @ModelAttribute User u, @ModelAttribute rSearch search, @RequestParam("area") String area, @RequestParam("thema") String thema, - @RequestParam("routeDate") Date routeDate ) { // 루트 검색 - // 사용자별 찜한 숙소리스트 가져오기 + @RequestParam("routeDate") Date routeDate, + ModelAndView mv) { // 루트 검색 + User lgus = (User)session.getAttribute("loginUser"); + + u.setUsno(lgus.getUsno()); + if(u.getUsno() != null) { + // 사용자별 찜한 숙소리스트 가져오기 List jjimHotel = mService.findHotelJjimList(u); //System.out.println("jjimHotel 확인 : " + jjimHotel); + + // 검색 모달창에 찜한 사업장 가져오기 + List jjimB = rService.jjimBusiness(u); + /* System.out.println("찜한 사업장: " + jjimB); */ + model.addAttribute("jjimList", jjimHotel); + model.addAttribute("jjimB", jjimB); } - model.addAttribute("area", area); model.addAttribute("thema", thema); model.addAttribute("routeDate", routeDate); @@ -69,11 +81,20 @@ public String searchRoute(Model model, List list = rService.routeSearch(search); model.addAttribute("list", list); - return "route/route_result"; + /* 한빈 */ + List hotelList = bService.selectHotelListP(); +// System.out.println(hotelList); + if(hotelList != null) { + mv.addObject("hotelList", hotelList); +// System.out.println("hotelList2" + hotelList); + mv.setViewName("route/route_result"); + } + + return mv; } @PostMapping("/changeRoute") - public String changeRoutePage(HttpSession session, Model model, String[] rrlist) { // 여행지 순서 바꾸기 페이지로 이동 + public ModelAndView changeRoutePage(HttpSession session, Model model, String[] rrlist, @ModelAttribute User u, ModelAndView mv) { // 여행지 순서 바꾸기 페이지로 이동 String area = (String)session.getAttribute("area"); String thema = (String)session.getAttribute("thema"); Date routeDate = (Date)session.getAttribute("routeDate"); @@ -82,11 +103,37 @@ public String changeRoutePage(HttpSession session, Model model, String[] rrlist) List rlist = rService.changeRoute(rrlist); - /* System.out.println("rlist: " + rlist); */ - + //System.out.println("rlist: " + rlist); model.addAttribute("list", rlist); - - return "route/route_edit"; + + User loginUser = (User)session.getAttribute("loginUser"); + + if(loginUser != null) { + u.setUsno(loginUser.getUsno()); + + // 사용자별 찜한 숙소리스트 가져오기 + List jjimHotel = mService.findHotelJjimList(u); + //System.out.println("jjimHotel 확인 : " + jjimHotel); + + // 검색 모달창에 찜한 사업장 가져오기 + List jjimB = rService.jjimBusiness(u); + /* System.out.println("찜한 사업장: " + jjimB); */ + + model.addAttribute("jjimList", jjimHotel); + model.addAttribute("jjimB", jjimB); + } + + + /* 한빈 */ + List hotelList = bService.selectHotelListP(); +// System.out.println(hotelList); + if(hotelList != null) { + mv.addObject("hotelList", hotelList); +// System.out.println("hotelList2" + hotelList); + mv.setViewName("route/route_edit"); + } + + return mv; } @@ -115,21 +162,47 @@ public String changeRoutePage(HttpSession session, Model model, String[] rrlist) @PostMapping("/clearChange") - public String clearChange(HttpSession session, Model model, String[] chlist) { // 여행지 순서 바꾸기 완료 + public ModelAndView clearChange(HttpSession session, Model model, String[] chlist, @ModelAttribute User u, ModelAndView mv ) { // 여행지 순서 바꾸기 완료 String area = (String)session.getAttribute("area"); String thema = (String)session.getAttribute("thema"); Date routeDate = (Date)session.getAttribute("routeDate"); + User loginUser = (User)session.getAttribute("loginUser"); - /* System.out.println(Arrays.toString(chlist)); */ - List clist = rService.clearChange(chlist); + /* System.out.println("chlist: " + Arrays.toString(chlist)); */ - /* System.out.println(clist); */ + List clist = rService.clearChange(chlist); + + System.out.println("clist: " + clist); model.addAttribute("list", clist); + if(loginUser != null) { + u.setUsno(loginUser.getUsno()); + // 사용자별 찜한 숙소리스트 가져오기 + List jjimHotel = mService.findHotelJjimList(u); + System.out.println("jjimHotel 확인 : " + jjimHotel); + + // 검색 모달창에 찜한 사업장 가져오기 + List jjimB = rService.jjimBusiness(u); + /* System.out.println("찜한 사업장: " + jjimB); */ + + model.addAttribute("jjimList", jjimHotel); + model.addAttribute("jjimB", jjimB); + } + + + /* 한빈 */ + List hotelList = bService.selectHotelListP(); +// System.out.println(hotelList); + if(hotelList != null) { + mv.addObject("hotelList", hotelList); +// System.out.println("hotelList2" + hotelList); + mv.setViewName("route/route_result"); + } + /* return "redirect:/route/search"; */ - return "route/route_result"; + return mv; } @PostMapping("/addRoute") @@ -156,7 +229,11 @@ public String finalRoute(HttpSession session, Model model, RouteFinal rf) { User loginUser = (User)session.getAttribute("loginUser"); String price = (String)session.getAttribute("price"); - rf.setRoute_date(routeDate); + System.out.println(routeDate); + SimpleDateFormat format1 = new SimpleDateFormat ( "yyyy/MM/dd"); + String time1 = format1.format(routeDate); + + rf.setRoute_date(time1); rf.setUs_no(loginUser.getUsno()); rf.setRoute_price(price); diff --git a/src/main/java/com/kh/samdado/route/model/dao/RouteDao.java b/src/main/java/com/kh/samdado/route/model/dao/RouteDao.java index cf08dbe1..65570547 100644 --- a/src/main/java/com/kh/samdado/route/model/dao/RouteDao.java +++ b/src/main/java/com/kh/samdado/route/model/dao/RouteDao.java @@ -17,7 +17,7 @@ public interface RouteDao { List spotSearch(String sTitle); - List clearChange(String[] chlist); + List clearChange(String[] chlist); int addRoute(String[] slist); @@ -26,4 +26,6 @@ public interface RouteDao { List changeRoute(String[] rrlist); List spotSearch1(String sTitle); + + List jjimBusiness(User u); } diff --git a/src/main/java/com/kh/samdado/route/model/dao/RouteDaoImpl.java b/src/main/java/com/kh/samdado/route/model/dao/RouteDaoImpl.java index 2de3d7a3..d57d7f55 100644 --- a/src/main/java/com/kh/samdado/route/model/dao/RouteDaoImpl.java +++ b/src/main/java/com/kh/samdado/route/model/dao/RouteDaoImpl.java @@ -33,14 +33,17 @@ public List spotSearch(String sTitle) { } @Override - public List clearChange(String[] chlist) { + public List clearChange(String[] chlist) { + + System.out.println("chlist dao: " + Arrays.toString(chlist)); + return sqlSession.selectList("routeMapper.clearChange", chlist); } @Override public int addRoute(String[] slist) { - /* System.out.println("dao: " + Arrays.toString(slist)); */ + System.out.println("dao: " + Arrays.toString(slist)); return sqlSession.insert("routeMapper.addRoute", slist); } @@ -66,6 +69,11 @@ public List spotSearch1(String sTitle) { return sqlSession.selectList("routeMapper.spotSearch1", sTitle); } + @Override + public List jjimBusiness(User u) { + return sqlSession.selectList("routeMapper.jjimBusiness", u); + } + diff --git a/src/main/java/com/kh/samdado/route/model/service/RouteService.java b/src/main/java/com/kh/samdado/route/model/service/RouteService.java index e0809159..90ee47f7 100644 --- a/src/main/java/com/kh/samdado/route/model/service/RouteService.java +++ b/src/main/java/com/kh/samdado/route/model/service/RouteService.java @@ -17,7 +17,7 @@ public interface RouteService { public List spotSearch(String sTitle); // 여행지 검색 - List clearChange(String[] chlist); // 순서 변경 완료 + List clearChange(String[] chlist); // 순서 변경 완료 int addRoute(String[] slist); @@ -27,6 +27,8 @@ public interface RouteService { List spotSearch1(String sTitle); + List jjimBusiness(User u); + diff --git a/src/main/java/com/kh/samdado/route/model/service/RouteServiceImpl.java b/src/main/java/com/kh/samdado/route/model/service/RouteServiceImpl.java index 0f961eed..e86ddce6 100644 --- a/src/main/java/com/kh/samdado/route/model/service/RouteServiceImpl.java +++ b/src/main/java/com/kh/samdado/route/model/service/RouteServiceImpl.java @@ -36,7 +36,10 @@ public List spotSearch(String sTitle) { } @Override - public List clearChange(String[] chlist) { + public List clearChange(String[] chlist) { + + System.out.println("chlist 서비스: " + Arrays.toString(chlist)); + return rDao.clearChange(chlist); } @@ -70,6 +73,11 @@ public List spotSearch1(String sTitle) { return rDao.spotSearch1(sTitle); } + @Override + public List jjimBusiness(User u) { + return rDao.jjimBusiness(u); + } + diff --git a/src/main/java/com/kh/samdado/route/model/vo/RouteFinal.java b/src/main/java/com/kh/samdado/route/model/vo/RouteFinal.java index c6bd76ea..9dadc5a5 100644 --- a/src/main/java/com/kh/samdado/route/model/vo/RouteFinal.java +++ b/src/main/java/com/kh/samdado/route/model/vo/RouteFinal.java @@ -21,7 +21,7 @@ public class RouteFinal { private int route_no; // 루트 번호 @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date route_date; // 루트 날짜 + private String route_date; // 루트 날짜 private String route_price; // 총 예상 예산 private String us_no; // 회원 번호 diff --git a/src/main/java/com/kh/samdado/user/controller/UserController.java b/src/main/java/com/kh/samdado/user/controller/UserController.java index 1e9f65dd..ee5fdae9 100644 --- a/src/main/java/com/kh/samdado/user/controller/UserController.java +++ b/src/main/java/com/kh/samdado/user/controller/UserController.java @@ -1,9 +1,7 @@ package com.kh.samdado.user.controller; -import java.io.IOException; import java.util.Random; -import javax.servlet.http.HttpSession; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -42,6 +40,7 @@ public class UserController { @Autowired private EmailSender emailSender; + @Autowired private Email email; @@ -51,8 +50,6 @@ public String userJoin(@ModelAttribute User u, Model model, RedirectAttributes rd) { - // System.out.println("넘어온 값 : " + u); - if (u.getBusno().equals("")) { // 값이 없으면 일반회원 u.setUspart("일반"); } else { // 값이 있으면 제휴회원 @@ -79,8 +76,7 @@ public String userJoin(@ModelAttribute User u, // 3_1. 회원가입시 바로 로그인되는 컨트롤러 (DB select) @GetMapping(value="/login")// 일반 로그인 post 방식, 회원가입 후 ‹š 바로 로그인 get 방식 -> 리다이렉트로 여기서 받음 - public String userLogin( - Model model, + public String userLogin(Model model, @ModelAttribute("joinedUser") User joinedUser) { // 회원가입하고 난 후 바로 로그인용 여기서 받음 // 회원 가입 후 바로 로그인이니까 암호화 필요x @@ -93,8 +89,6 @@ public String userLogin( } else { throw new UserException("회원가입 후 로그인에 실패하였습니다."); } - - } @@ -122,7 +116,7 @@ public String userLogin(@ModelAttribute User u, public String userchangePwdlogin( Model model, @ModelAttribute("successChangePwdUser") User successChangePwdUser) { - System.out.println("111 successChangePwdUser : " + successChangePwdUser.toString()); + //System.out.println("111 successChangePwdUser : " + successChangePwdUser.toString()); // 비번 수정 후 바로 로그인이니까 암호화 필요x if (successChangePwdUser.getUsid() != null) { // 널이 아니면 @@ -347,6 +341,7 @@ private String getAuthCode() { return buffer.toString(); // 리턴타입 스트링 } + @GetMapping("/aboutus") public String goToAboutUs() { return "common/aboutUs"; diff --git a/src/main/java/com/kh/samdado/user/model/vo/EmailSender.java b/src/main/java/com/kh/samdado/user/model/vo/EmailSender.java index c02ad2a9..3e807570 100644 --- a/src/main/java/com/kh/samdado/user/model/vo/EmailSender.java +++ b/src/main/java/com/kh/samdado/user/model/vo/EmailSender.java @@ -12,7 +12,7 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Component; -import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeUtility; +//import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeUtility; @Component // Bean 등록 public class EmailSender { @@ -34,12 +34,12 @@ public void SendEmail(Email email) throws Exception { // 본인 컴퓨터에 있는 첨부파일 경로로 바꿔주세용!! DataSource dataSource = new FileDataSource("C:\\Users\\scybj\\OneDrive\\바탕 화면\\삼다도\\삼다도.png"); - messageHelper.addAttachment(MimeUtility.encodeText("삼다도.png", "UTF-8", "B"), dataSource); + //messageHelper.addAttachment(MimeUtility.encodeText("삼다도.png", "UTF-8", "B"), dataSource); String htmlStr = "

[비밀번호 찾기]

" + "
여러분의 제주 여행 동반자, 삼다도입니다." + "
아래 링크를 클릭하여 비밀번호를 변경해주세요!" - + "

비밀번호 변경하러 가기"; messageHelper.setText(htmlStr, true); diff --git a/src/main/java/com/kh/samdado/user/model/vo/User.java b/src/main/java/com/kh/samdado/user/model/vo/User.java index b6617e6c..eccf9a72 100644 --- a/src/main/java/com/kh/samdado/user/model/vo/User.java +++ b/src/main/java/com/kh/samdado/user/model/vo/User.java @@ -35,7 +35,10 @@ public class User { private Date usstop; private String authKey; private int pbalance; + private Date enrolldate; + private int usnews; + private int upartcount; private String utodate; // 관리자 서치 날짜 포멧팅을 위한 컬럼 diff --git a/src/main/resources/mappers/admin-mapper.xml b/src/main/resources/mappers/admin-mapper.xml index f0f40772..c0b86368 100644 --- a/src/main/resources/mappers/admin-mapper.xml +++ b/src/main/resources/mappers/admin-mapper.xml @@ -15,6 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + + + + + + + + + + + + + + + + + + @@ -566,6 +585,16 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" AND ITEM = '프리미엄' AND BUS_CLASSIFY = 'P' AND ISTATUS IS NULL + GROUP BY PAY_NO, + ITEM, + AMOUNT, + PDATE, + EXDATE, + INCOME.US_NO, + US_NAME, + BUSINESS.BUS_CATEGORY, + BUSINESS.BUS_CODE, + ISTATUS ORDER BY PDATE DESC @@ -623,13 +652,10 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" ORDER BY PAY_NO - + SUM(AMOUNT) FROM INCOME @@ -639,6 +665,18 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" ORDER BY EXTRACT(YEAR FROM PDATE) + --> + - SELECT ITEM, SUM(AMOUNT) AS PAMOUNT, EXTRACT(MONTH FROM PDATE), - EXTRACT(YEAR FROM PDATE) - FROM - INCOME - WHERE - PDATE >= ADD_MONTHS(SYSDATE,-6) - AND ITEM LIKE '%'||#{ item }||'%' - GROUP BY ITEM, - EXTRACT(MONTH FROM PDATE), - EXTRACT(YEAR FROM PDATE) - order by EXTRACT(year FROM PDATE) + + + SELECT ITEM, SUM(AMOUNT) AS PAMOUNT, EXTRACT(MONTH FROM PDATE), + EXTRACT(YEAR FROM PDATE) + FROM + INCOME + WHERE + PDATE > ADD_MONTHS(SYSDATE,-6) + GROUP BY ROLLUP(ITEM), + EXTRACT(MONTH FROM PDATE), + EXTRACT(YEAR FROM PDATE) + HAVING ITEM LIKE '%'||#{ item }||'%' + ORDER BY EXTRACT(YEAR FROM PDATE) + + + + SELECT ITEM, SUM(AMOUNT) AS PAMOUNT, EXTRACT(MONTH FROM PDATE), + EXTRACT(YEAR FROM PDATE) + FROM + INCOME + WHERE + PDATE > ADD_MONTHS(SYSDATE,-6) + GROUP BY ROLLUP(ITEM), + EXTRACT(MONTH FROM PDATE), + EXTRACT(YEAR FROM PDATE) + HAVING ITEM IS NULL + ORDER BY EXTRACT(YEAR FROM PDATE) + + + \ No newline at end of file diff --git a/src/main/resources/mappers/business-mapper.xml b/src/main/resources/mappers/business-mapper.xml index b8c95947..081eb71c 100644 --- a/src/main/resources/mappers/business-mapper.xml +++ b/src/main/resources/mappers/business-mapper.xml @@ -51,6 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + + + + + @@ -245,6 +251,32 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,18 +614,14 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + @@ -702,6 +767,9 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , BUS_OPENING , BT.FILE_RENAME , BT.FILE_LV + , AVGSTAR + , RES_CATEGORY + , RECNT FROM BUSINESS B JOIN @@ -736,6 +804,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , BUS_OPENING , BT.FILE_RENAME , BT.FILE_LV + , AVGSTAR + , RECNT FROM BUSINESS B JOIN @@ -769,6 +839,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" ALLIANCE A, "USER" U WHERE A.US_NO = U.US_NO + AND A.ALSTATUS = 'Y' AND U.PBALANCE != 0 @@ -837,6 +908,41 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" AND US_NO = #{usno} --> + + - AND "USER".PBALANCE = 0) + AND (ALSTATUS = 'Y' OR ALSTATUS = 'N') + AND "USER".PBALANCE = 0) + AND US_NO = #{usno} + --> + + SELECT + BUS_CODE, + BUS_NAME, + BUS_ADDRESS + FROM + BUSINESS + WHERE BUS_CODE NOT IN (SELECT + BUS_CODE + FROM + ALLIANCE, "USER" + WHERE + ALLIANCE.US_NO = "USER".US_NO + AND (ALSTATUS = 'Y' OR ALSTATUS = 'N') + AND ALLIANCE.US_NO = #{usno}) AND US_NO = #{usno} @@ -1322,6 +1445,15 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" ROWNUM = 1 + + UPDATE + "USER" + SET + PBALANCE = #{pbalance} + WHERE + US_NO = #{usno} + + + + @@ -1406,6 +1584,10 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , PRO_ADULT , PRO_YOUTH , PRO_CHILD + , TOUR_TEMA + , TOUR_CATEGORY + , AVGSTAR + , RECNT FROM BUSINESS B, BUSINESS_ATT BT, TOUR_PRODUCT TP WHERE @@ -1415,9 +1597,288 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" AND BUS_STATUS = 'Y' AND B.TOUR_CATEGORY = #{kind} AND BT.FILE_LV = '0' - ORDER BY DBMS_RANDOM.RANDOM + AND B.BUS_CODE NOT IN (SELECT + R.REF_BUS_CODE + FROM + BUSINESS B, REPORT R + WHERE B.BUS_CODE = R.REF_BUS_CODE + AND R.REXDATE IS NOT NULL) + + + + + + + @@ -1508,6 +1967,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , HOTEL_CATEGORY , BT.FILE_RENAME , BT.FILE_LV + , AVGSTAR + , RECNT FROM BUSINESS B JOIN @@ -1543,11 +2004,15 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , BUS_PHONE , RES_CATEGORY , BUS_OPENING + , TOUR_TEMA + , TOUR_CATEGORY , BT.FILE_RENAME , BT.FILE_LV , PRO_ADULT , PRO_YOUTH , PRO_CHILD + , AVGSTAR + , RECNT FROM BUSINESS B, BUSINESS_ATT BT, TOUR_PRODUCT TP WHERE @@ -1579,6 +2044,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , RES_CATEGORY , BT.FILE_RENAME , BT.FILE_LV + , AVGSTAR + , RECNT FROM BUSINESS B JOIN @@ -1615,6 +2082,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , BUS_OPENING , BT.FILE_RENAME , BT.FILE_LV + , AVGSTAR + , RECNT FROM BUSINESS B JOIN @@ -1644,6 +2113,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" AND "USER".PBALANCE ]]> 0 AND ALSTATUS = 'Y' GROUP BY AL_NO, BUS_CODE, A_IMG_CNAME + Order by dbms_random.random + SELECT BUS_CODE, AVG(RE_STAR) AS "AVSTAR", COUNT(REV_COMMENT) AS "REVCNT" + FROM REVIEW + GROUP BY BUS_CODE + diff --git a/src/main/resources/mappers/mypage_mapper.xml b/src/main/resources/mappers/mypage_mapper.xml index 3bea56fa..3b907ecd 100644 --- a/src/main/resources/mappers/mypage_mapper.xml +++ b/src/main/resources/mappers/mypage_mapper.xml @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + @@ -182,6 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + @@ -196,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + @@ -250,6 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + @@ -264,6 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + @@ -317,6 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + @@ -628,16 +634,18 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" @@ -647,7 +655,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" WHERE B.BUS_CODE = BA.BUS_CODE AND B.US_NO = #{usno} AND BA.FILE_LV = 0 - ORDER BY B.BUS_CODE DESC + ORDER BY B.BUS_DATE DESC @@ -738,7 +746,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" INSERT - INTO NEWS + INTO NEWS ( NNO , US_NO @@ -761,7 +769,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" INSERT - INTO NEWS + INTO NEWS ( NNO , US_NO @@ -784,7 +792,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" INSERT - INTO NEWS + INTO NEWS ( NNO , US_NO @@ -814,7 +822,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" INSERT INTO NEWS(NNO, US_NO, NTITLE, NSTATUS, NCATE, NKEYNO, N_DATE) - VALUES (NEWS_SEQ_NO.NEXTVAL, #{usno}, '회원님의 사업장에대한 신고가 3회 누적되었습니다.', 'N', 'R', #{nkeyno}, SYADATE) + VALUES (NEWS_SEQ_NO.NEXTVAL, #{usno}, '회원님의 사업장에대한 신고가 3회 누적되었습니다.', 'N', 'R', #{nkeyno}, SYSDATE) @@ -1091,6 +1099,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" FROM JJIM WHERE US_NO = #{us_no} AND BUS_CODE = #{ bus_code } + ORDER BY JJIM_NO DESC @@ -1213,7 +1222,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + + UPDATE BUSINESS + SET AVGSTAR = (SELECT TRUNC(AVG(RE_STAR),2) FROM REVIEW WHERE BUS_CODE = #{bus_code} GROUP BY BUS_CODE), + RECNT = (SELECT COUNT(REV_COMMENT) FROM REVIEW WHERE BUS_CODE = #{bus_code} GROUP BY BUS_CODE) + WHERE BUS_CODE = #{bus_code} + + + + + UPDATE "USER" + SET USNEWS = USNEWS + 1 + + + UPDATE "USER" + SET USNEWS = USNEWS + 1 + WHERE US_PART = '일반' + + + UPDATE "USER" + SET USNEWS = USNEWS + 1 + WHERE US_PART = '제휴' + + + + UPDATE "USER" + SET USNEWS = USNEWS + 1 + WHERE US_NO = #{usno} + + + UPDATE "USER" + SET USNEWS = USNEWS - 1 + WHERE US_NO = #{usno} + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/route-mapper.xml b/src/main/resources/mappers/route-mapper.xml index 748b47a2..14c6fb5b 100644 --- a/src/main/resources/mappers/route-mapper.xml +++ b/src/main/resources/mappers/route-mapper.xml @@ -66,6 +66,34 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT - SPOT_TITLE, - SPOT_ADDRESS, - SPOT_PATH, - SPOT_ONAME, - SPOT_PRICE - + SELECT + * FROM - TOUR_SPOT - WHERE - SPOT_TITLE IN ( - - #{st} - - ) - - ORDER BY ( - CASE SPOT_TITLE + ( + SELECT + SPOT_TITLE, + SPOT_ADDRESS, + SPOT_PATH, + SPOT_ONAME, + SPOT_PRICE, + spot_content + + FROM TOUR_SPOT + WHERE + SPOT_TITLE IN ( + + #{st} + + ) + + UNION + + SELECT + BUS_NAME, + (SUBSTR(BUS_ADDRESS, INSTR(BUS_ADDRESS, ',', 1, 1) + 1, INSTR(BUS_ADDRESS,',',1,2)-INSTR(BUS_ADDRESS, ',', 1, 1) - 1)) BUS_ADDRESS, + '../resources/busUploadFiles/', + FILE_RENAME, + to_number(PRO_ADULT), + BUS_INTRO + FROM BVIEW + WHERE + BUS_NAME IN( + + #{st} + + ) + ) + ORDER BY ( + CASE SPOT_TITLE WHEN #{st} THEN #{idx} @@ -212,7 +256,52 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" @@ -287,4 +376,17 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , #{us_no} ) + + \ No newline at end of file diff --git a/src/main/resources/mappers/user-mapper.xml b/src/main/resources/mappers/user-mapper.xml index 712b8c67..01868c53 100644 --- a/src/main/resources/mappers/user-mapper.xml +++ b/src/main/resources/mappers/user-mapper.xml @@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" + + @@ -35,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , US_STATUS , US_STOP , PBALANCE + , ENROLL_DATE + , USNEWS FROM "USER" WHERE @@ -58,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , US_PART , US_STATUS , PBALANCE + , ENROLL_DATE + , USNEWS ) VALUES ( @@ -72,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , #{uspart} , DEFAULT , DEFAULT + , DEFAULT + , DEFAULT ) @@ -268,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" , US_STOP , AUTH_KEY , PBALANCE + , ENROLL_DATE FROM "USER" WHERE US_STOP IS NULL @@ -287,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" ,US_PART ,US_STATUS ,PBALANCE + ,ENROLL_DATE FROM "USER" @@ -321,6 +331,9 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" AND PBALANCE LIKE #{sv} + + AND ENROLL_DATE LIKE #{sv} + AND (US_NO LIKE #{sv} OR US_ID LIKE #{sv} @@ -332,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapepr 3.0//EN" OR US_PART LIKE #{sv}) OR US_STATUS LIKE #{sv}) OR PBALANCE LIKE #{sv}) + OR ENROLL_DATE LIKE #{sv}) diff --git a/src/main/webapp/WEB-INF/views/admin/admin-navi-up.jsp b/src/main/webapp/WEB-INF/views/admin/admin-navi-up.jsp index ed8db454..08fcc5a8 100644 --- a/src/main/webapp/WEB-INF/views/admin/admin-navi-up.jsp +++ b/src/main/webapp/WEB-INF/views/admin/admin-navi-up.jsp @@ -7,6 +7,8 @@ Insert title here + + diff --git a/src/main/webapp/WEB-INF/views/admin/admin-navi.jsp b/src/main/webapp/WEB-INF/views/admin/admin-navi.jsp index 96976b17..b1d38b3f 100644 --- a/src/main/webapp/WEB-INF/views/admin/admin-navi.jsp +++ b/src/main/webapp/WEB-INF/views/admin/admin-navi.jsp @@ -7,6 +7,8 @@ admin + + @@ -28,7 +30,7 @@ diff --git a/src/main/webapp/WEB-INF/views/admin/adminAd2Manage.jsp b/src/main/webapp/WEB-INF/views/admin/adminAd2Manage.jsp index b0595efe..627bdba0 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminAd2Manage.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminAd2Manage.jsp @@ -6,6 +6,8 @@ + + @@ -168,7 +170,7 @@ --> - + diff --git a/src/main/webapp/WEB-INF/views/admin/adminCheckbussinessForm.jsp b/src/main/webapp/WEB-INF/views/admin/adminCheckbussinessForm.jsp index 375dc2f2..9854a7ec 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminCheckbussinessForm.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminCheckbussinessForm.jsp @@ -10,6 +10,8 @@ Insert title here + + diff --git a/src/main/webapp/WEB-INF/views/admin/adminHome.jsp b/src/main/webapp/WEB-INF/views/admin/adminHome.jsp index 50c80503..60ef9449 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminHome.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminHome.jsp @@ -6,6 +6,8 @@ + + @@ -47,7 +49,7 @@

광고별 매출

-
배너광고 | 프리미엄 광고 | 커미션 매출 내역이 보여집니다.
+
최근 6개월 배너광고 | 프리미엄 광고 | 커미션 | 총매출 내역이 보여집니다.


@@ -67,60 +69,65 @@ method: "post", async: false, // 비동기가 아니도록 처리 success : function(data) { - console.log("AJAX SUCCESS!"); + //console.log("AJAX SUCCESS!"); //console.log(data); for (var i in data) { - //var pamount = $(data[i].pamount); - //console.log(pamount); - allprofits.push(data[i].pamount); - - } }, error : function(e) { - console.log("AJAX FAILED.."); + //console.log("AJAX FAILED.."); } }); - console.log(allprofits); + //console.log(allprofits); return allprofits; } + function getUserData(userType) { + + var userData = []; + obj = { uspart: userType }; // 키값 vo 필드명이랑 일치 + + $.ajax({ + url : "${ contextPath }/admin/selectGetUserData", + dataType : "json", + data: JSON.stringify(obj), + contentType: "application/json", + method: "post", + async: false, // 비동기가 아니도록 처리 + success : function(data) { + console.log("AJAX SUCCESS!"); + //console.log(data); + + for (var i in data) { + //var upartcount = $(data[i].upartcount); + //console.log(upartcount); + + userData.push(data[i].upartcount); + } + + }, + error : function(e) { + console.log("AJAX FAILED.."); + + } + }); + console.log(userData); + return userData; + } + + +
@@ -386,8 +414,8 @@ 사업장 No - 회원명 - 카테고리 + 회원명 + 카테고리 사업장명 사업장주소 diff --git a/src/main/webapp/WEB-INF/views/admin/adminMypage.jsp b/src/main/webapp/WEB-INF/views/admin/adminMypage.jsp index 1c7e1771..21239ce9 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminMypage.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminMypage.jsp @@ -11,6 +11,8 @@ + + diff --git a/src/main/webapp/WEB-INF/views/admin/adminQna.jsp b/src/main/webapp/WEB-INF/views/admin/adminQna.jsp index c1338ae1..7f10ada1 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminQna.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminQna.jsp @@ -5,6 +5,8 @@ + + @@ -156,7 +158,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/admin/adminReportManage.jsp b/src/main/webapp/WEB-INF/views/admin/adminReportManage.jsp index a4f45beb..c3def72a 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminReportManage.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminReportManage.jsp @@ -6,6 +6,8 @@ + + @@ -70,8 +72,8 @@ ${ rpl.bus_code } - - + + @@ -132,24 +134,26 @@
@@ -238,7 +242,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/admin/adminuserList.jsp b/src/main/webapp/WEB-INF/views/admin/adminuserList.jsp index e5cbdf14..fca0a6ce 100644 --- a/src/main/webapp/WEB-INF/views/admin/adminuserList.jsp +++ b/src/main/webapp/WEB-INF/views/admin/adminuserList.jsp @@ -6,6 +6,8 @@ + + @@ -248,7 +250,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/admin/updateAdminInfoPage.jsp b/src/main/webapp/WEB-INF/views/admin/updateAdminInfoPage.jsp index 5cc305cd..26ed45dd 100644 --- a/src/main/webapp/WEB-INF/views/admin/updateAdminInfoPage.jsp +++ b/src/main/webapp/WEB-INF/views/admin/updateAdminInfoPage.jsp @@ -11,6 +11,8 @@ + + diff --git a/src/main/webapp/WEB-INF/views/business/businessFormSubmit.jsp b/src/main/webapp/WEB-INF/views/business/businessFormSubmit.jsp index 87eaf2d6..ad7deee8 100644 --- a/src/main/webapp/WEB-INF/views/business/businessFormSubmit.jsp +++ b/src/main/webapp/WEB-INF/views/business/businessFormSubmit.jsp @@ -11,6 +11,7 @@ 삼다도 배너광고 신청 + @@ -38,10 +39,10 @@
- +
-
+

@@ -69,7 +70,7 @@
삼다도 배너 광고는 관리자의 승인이 필수이며 관리자 승인 여부에 따라 삼다도 메인페이지 하단에 리스팅 형식으로 노출됩니다. - 자세한 사항은 ‘삼다도에 대해서’페이지에서 확인 해 주세요! + 자세한 사항은 ‘삼다도에 대해서’페이지에서 확인 해 주세요!

배너 광고는 포인트 충전이 필요한 서비스입니다.
@@ -96,7 +97,7 @@
사업장 신청 주의사항
-

* 신청 대기중 또는 현재 배너 광고가 진행중인 사업장은 목록에 리스트되지 않습니다.

+

* 현재 배너 광고가 진행중인 사업장은 목록에 리스트되지 않습니다.

@@ -966,7 +913,7 @@
- + @@ -985,7 +932,6 @@ @@ -1179,4 +1134,4 @@ - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/views/business/hotel/hotel_list.jsp b/src/main/webapp/WEB-INF/views/business/hotel/hotel_list.jsp index 640636ba..a9a73206 100644 --- a/src/main/webapp/WEB-INF/views/business/hotel/hotel_list.jsp +++ b/src/main/webapp/WEB-INF/views/business/hotel/hotel_list.jsp @@ -1,6 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> @@ -10,11 +11,22 @@ Samadado - - +
+
@@ -369,8 +374,8 @@
- +
@@ -389,7 +394,7 @@

- +
@@ -469,12 +474,19 @@ - +
@@ -913,7 +931,7 @@
- +
@@ -934,6 +952,14 @@ - +
+