fix : 쇼핑몰 구독서비스 관련
This commit is contained in:
@@ -12,7 +12,10 @@ import java.util.List;
|
||||
@Repository
|
||||
public interface BOSubsvcMapper {
|
||||
|
||||
/** 구독서비스 목록 조회*/
|
||||
List<DataMap> selectBOSubsvcList(BOSubsvcVO vo);
|
||||
/** 구독서비스 상세 조회*/
|
||||
DataMap selectBOSubsvcDetail(BOSubsvcVO vo);
|
||||
|
||||
/** 관리자 구독서비스 목록 조회*/
|
||||
List<DataMap> selectBOMngrSubsvcList(BOSubsvcVO vo);
|
||||
|
||||
@@ -30,4 +30,17 @@ public class BOSubsvcService {
|
||||
return dataList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 구독서비스 상세 조회
|
||||
* @param vo
|
||||
* @return
|
||||
*/
|
||||
public DataMap selectBOSubsvcDetail(BOSubsvcVO vo) {
|
||||
DataMap dataMap = new DataMap();
|
||||
|
||||
dataMap = mapper.selectBOSubsvcDetail(vo);
|
||||
|
||||
return dataMap;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
|
||||
import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
|
||||
import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO;
|
||||
import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
|
||||
import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
|
||||
import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
|
||||
import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
|
||||
import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO;
|
||||
import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService;
|
||||
@@ -20,15 +22,11 @@ import com.wb.domainserver.domain.gcone.setup.site.vo.BOPrevewVO;
|
||||
import com.wb.domainserver.domain.gcone.setup.site.vo.BOSiteVO;
|
||||
import com.wb.domainserver.domain.itrnt.str.service.BOItrntStrService;
|
||||
import com.wb.domainserver.domain.itrnt.str.vo.BOItrntStrVO;
|
||||
import com.wb.domainserver.domain.sample.vo.PrevewVO;
|
||||
import com.wb.domainserver.domain.sopmal.main.vo.BrandVO;
|
||||
import com.wb.domainserver.domain.sopmal.main.vo.MaSopmalVO;
|
||||
import com.wb.domainserver.domain.sopmal.main.vo.MainVO;
|
||||
import com.wb.domainserver.domain.sopmal.main.vo.StrVO;
|
||||
import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyOrdrDlvyVO;
|
||||
import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyRefundVO;
|
||||
import com.wb.domainserver.exception.WnbtRestException;
|
||||
import com.wb.domainserver.response.ApiResponse;
|
||||
import com.wb.domainserver.response.WnbtResponse;
|
||||
import com.wb.domainserver.response.WnbtResponseBody;
|
||||
import com.wb.domainserver.response.WnbtWebClientResponseHandler;
|
||||
@@ -36,7 +34,9 @@ import com.wb.domainserver.security.authentication.AnonymousUser;
|
||||
import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
|
||||
import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
|
||||
import com.wb.domainserver.security.authorization.annotation.Policy;
|
||||
import com.wb.domainserver.util.communicate.*;
|
||||
import com.wb.domainserver.util.communicate.KakaoProperties;
|
||||
import com.wb.domainserver.util.communicate.MultiValueMapConverter;
|
||||
import com.wb.domainserver.util.communicate.SendToResrc;
|
||||
import com.wb.domainserver.util.dataaccess.DataMap;
|
||||
import com.wb.domainserver.util.util.Util;
|
||||
import jakarta.servlet.http.Cookie;
|
||||
@@ -45,14 +45,12 @@ import jakarta.servlet.http.HttpSession;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.util.MultiValueMap;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import java.math.BigInteger;
|
||||
@@ -99,6 +97,8 @@ public class MainController {
|
||||
private BOMaSopmalService boMaSopmalService;
|
||||
@Autowired
|
||||
private BOMbrService boMbrService;
|
||||
@Autowired
|
||||
private BOSubsvcService boSubsvcService;
|
||||
|
||||
@Policy(AuthPolicy.PUBLIC)
|
||||
@RequestMapping(value= {"/","/index", "/sopmal/index","/sopmal/main"})
|
||||
@@ -796,15 +796,51 @@ public class MainController {
|
||||
|
||||
/**
|
||||
* 구독서비스 폼 이동
|
||||
*
|
||||
* @return
|
||||
* @param model
|
||||
* @param request
|
||||
* @return String
|
||||
*/
|
||||
@Policy(AuthPolicy.PUBLIC)
|
||||
@RequestMapping(value = "/sopmal/main/selectSubscribeForm")
|
||||
public String selectSubscribeForm(HttpServletRequest request) {
|
||||
public String selectSubscribeForm(ModelMap model, HttpServletRequest request) {
|
||||
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
|
||||
DataMap content = new DataMap();
|
||||
|
||||
BOSubsvcVO subsvcVo = new BOSubsvcVO();
|
||||
subsvcVo.setSopmalCd(user.getSopmalCd());
|
||||
content.put("subsvcList", boSubsvcService.selectBOSubsvcList(subsvcVo));
|
||||
|
||||
BOMaSopmalVO sopmalVO = new BOMaSopmalVO();
|
||||
sopmalVO.setSopmalCd(user.getSopmalCd());
|
||||
content.put("sopmalInfo", boMaSopmalService.selectBOSopmalUpdtForm(sopmalVO));
|
||||
|
||||
model.addAttribute("resultMap", content);
|
||||
|
||||
return Util.getDeviceType(request) + "/main/SubscribeR";
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 구독서비스 상세 조회
|
||||
* @param subsvcVO
|
||||
* @return ResponseEntity<WnbtResponse>
|
||||
*/
|
||||
@Policy(AuthPolicy.PUBLIC)
|
||||
@RequestMapping(value = "/sopmal/main/selectSubscribeDetail", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<?> selectSubscribeDetail(BOSubsvcVO subsvcVO) {
|
||||
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
|
||||
Map<String, Object> message = new HashMap<>();
|
||||
subsvcVO.setSopmalCd(user.getSopmalCd());
|
||||
|
||||
message.put("resultMap", boSubsvcService.selectBOSubsvcDetail(subsvcVO));
|
||||
|
||||
return ResponseEntity.ok(
|
||||
WnbtResponse.builder()
|
||||
.resBody(new WnbtResponseBody(message))
|
||||
.build()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 자담유 > 네가지약속 (모바일)
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user