diff --git a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java index 5b1fb768..e33d5ca1 100644 --- a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java +++ b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java @@ -176,7 +176,13 @@ public class KakaoStepInfoController { public String kakaoAlimtalkIntrdView(HttpServletRequest request, @ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model , BoardVO boardVO , RedirectAttributes redirectAttributes) throws Exception { - + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + if(userId == "") { + return "redirect:/web/user/login/login.do"; + } + model.addAttribute("loginVO", loginVO); return "/web/kakao/intrd/KakaoAllimtalkIntro"; } diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java index 601e1507..a7de9f72 100644 --- a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java +++ b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java @@ -1,7 +1,11 @@ package itn.let.mjo.pay.service; import itn.com.cmm.ComDefaultVO; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class MjonPayVO extends ComDefaultVO{ private static final long serialVersionUID = 1L; @@ -70,39 +74,6 @@ public class MjonPayVO extends ComDefaultVO{ private String blineCode; - public String getBlineCode() { - return blineCode; - } - - public void setBlineCode(String blineCode) { - this.blineCode = blineCode; - } - - public double getTotalPrice() { - return totalPrice; - } - - public void setTotalPrice(double totalPrice) { - this.totalPrice = totalPrice; - } - - public String getSearchCondition4() { - return searchCondition4; - } - - public String getScreenYn() { - return screenYn; - } - - - public void setScreenYn(String screenYn) { - this.screenYn = screenYn; - } - - - public void setSearchCondition4(String searchCondition4) { - this.searchCondition4 = searchCondition4; - } private String searchCmpltYn; @@ -259,1455 +230,10 @@ public class MjonPayVO extends ComDefaultVO{ private String spayDiv; // 간편결제분류 - public String getSpayDiv() { - return spayDiv; - } - - public void setSpayDiv(String spayDiv) { - this.spayDiv = spayDiv; - } - - public String getAmtSpaySum() { - return amtSpaySum; - } - - public void setAmtSpaySum(String amtSpaySum) { - this.amtSpaySum = amtSpaySum; - } - - public String getAmtSpaySumTot() { - return amtSpaySumTot; - } - - public void setAmtSpaySumTot(String amtSpaySumTot) { - this.amtSpaySumTot = amtSpaySumTot; - } - - public String getAmtSpayCnt() { - return amtSpayCnt; - } - - public void setAmtSpayCnt(String amtSpayCnt) { - this.amtSpayCnt = amtSpayCnt; - } - - public String getAmtSpayCntTot() { - return amtSpayCntTot; - } - - public void setAmtSpayCntTot(String amtSpayCntTot) { - this.amtSpayCntTot = amtSpayCntTot; - } - - public String getSpayMethod() { - return spayMethod; - } - - public void setSpayMethod(String spayMethod) { - this.spayMethod = spayMethod; - } - private int remainPoint; - - public int getRemainPoint() { - return remainPoint; - } - - public void setRemainPoint(int remainPoint) { - this.remainPoint = remainPoint; - } - - public String getLoginLastDate() { - return loginLastDate; - } - - public void setLoginLastDate(String loginLastDate) { - this.loginLastDate = loginLastDate; - } - - public String getMberId() { - return mberId; - } - - public void setMberId(String mberId) { - this.mberId = mberId; - } - - public String getMberNm() { - return mberNm; - } - - public void setMberNm(String mberNm) { - this.mberNm = mberNm; - } - - public String getRemainCash() { - return remainCash; - } - - public void setRemainCash(String remainCash) { - this.remainCash = remainCash; - } - - public String getUseCash() { - return useCash; - } - - public void setUseCash(String useCash) { - this.useCash = useCash; - } - - public String getTotCash() { - return totCash; - } - - public void setTotCash(String totCash) { - this.totCash = totCash; - } - - public String getTotAmtCnt() { - return totAmtCnt; - } - - public void setTotAmtCnt(String totAmtCnt) { - this.totAmtCnt = totAmtCnt; - } - - public String getTotAmt() { - return totAmt; - } - - public void setTotAmt(String totAmt) { - this.totAmt = totAmt; - } - - public String getMsgLastDate() { - return msgLastDate; - } - - public void setMsgLastDate(String msgLastDate) { - this.msgLastDate = msgLastDate; - } - - public String getPayLastDate() { - return payLastDate; - } - - public void setPayLastDate(String payLastDate) { - this.payLastDate = payLastDate; - } - - - public String getRegYear() { - return regYear; - } - - public void setRegYear(String regYear) { - this.regYear = regYear; - } - - public String getAmtYearSum() { - return amtYearSum; - } - - public void setAmtYearSum(String amtYearSum) { - this.amtYearSum = amtYearSum; - } - - public String getAmtCardCnt() { - return amtCardCnt; - } - - public void setAmtCardCnt(String amtCardCnt) { - this.amtCardCnt = amtCardCnt; - } - - public String getAmtCellCnt() { - return amtCellCnt; - } - - public void setAmtCellCnt(String amtCellCnt) { - this.amtCellCnt = amtCellCnt; - } - - public String getAmtBankCnt() { - return amtBankCnt; - } - - public void setAmtBankCnt(String amtBankCnt) { - this.amtBankCnt = amtBankCnt; - } - - public String getAmtVbankCnt() { - return amtVbankCnt; - } - - public void setAmtVbankCnt(String amtVbankCnt) { - this.amtVbankCnt = amtVbankCnt; - } - - public String getAmtRefundCnt() { - return amtRefundCnt; - } - - public void setAmtRefundCnt(String amtRefundCnt) { - this.amtRefundCnt = amtRefundCnt; - } - - public String getAmtTotCnt() { - return amtTotCnt; - } - - public void setAmtTotCnt(String amtTotCnt) { - this.amtTotCnt = amtTotCnt; - } - - public String getAmtCardCntTot() { - return amtCardCntTot; - } - - public void setAmtCardCntTot(String amtCardCntTot) { - this.amtCardCntTot = amtCardCntTot; - } - - public String getAmtCellCntTot() { - return amtCellCntTot; - } - - public void setAmtCellCntTot(String amtCellCntTot) { - this.amtCellCntTot = amtCellCntTot; - } - - public String getAmtBankCntTot() { - return amtBankCntTot; - } - - public void setAmtBankCntTot(String amtBankCntTot) { - this.amtBankCntTot = amtBankCntTot; - } - - public String getAmtVbankCntTot() { - return amtVbankCntTot; - } - - public void setAmtVbankCntTot(String amtVbankCntTot) { - this.amtVbankCntTot = amtVbankCntTot; - } - - public String getAmtRefundCntTot() { - return amtRefundCntTot; - } - - public void setAmtRefundCntTot(String amtRefundCntTot) { - this.amtRefundCntTot = amtRefundCntTot; - } - - public String getAmtTotCntTot() { - return amtTotCntTot; - } - - public void setAmtTotCntTot(String amtTotCntTot) { - this.amtTotCntTot = amtTotCntTot; - } - - - public String getAmtRefundSum() { - return amtRefundSum; - } - - public void setAmtRefundSum(String amtRefundSum) { - this.amtRefundSum = amtRefundSum; - } - - public String getAmtRefundSumTot() { - return amtRefundSumTot; - } - - public void setAmtRefundSumTot(String amtRefundSumTot) { - this.amtRefundSumTot = amtRefundSumTot; - } - - public String getAmtCardSumTot() { - return amtCardSumTot; - } - - public void setAmtCardSumTot(String amtCardSumTot) { - this.amtCardSumTot = amtCardSumTot; - } - - public String getAmtCellSumTot() { - return amtCellSumTot; - } - - public void setAmtCellSumTot(String amtCellSumTot) { - this.amtCellSumTot = amtCellSumTot; - } - - public String getAmtBankSumTot() { - return amtBankSumTot; - } - - public void setAmtBankSumTot(String amtBankSumTot) { - this.amtBankSumTot = amtBankSumTot; - } - - public String getAmtVbankSumTot() { - return amtVbankSumTot; - } - - public void setAmtVbankSumTot(String amtVbankSumTot) { - this.amtVbankSumTot = amtVbankSumTot; - } - - public String getAmtTotSumTot() { - return amtTotSumTot; - } - - public void setAmtTotSumTot(String amtTotSumTot) { - this.amtTotSumTot = amtTotSumTot; - } - - public String getBirthDate() { - return birthDate; - } - - public void setBirthDate(String birthDate) { - this.birthDate = birthDate; - } - - public Integer getSeqNo() { - return seqNo; - } - - public void setSeqNo(Integer seqNo) { - this.seqNo = seqNo; - } - - public String getResultCd() { - return resultCd; - } - - public void setResultCd(String resultCd) { - this.resultCd = resultCd; - } - - public String getAutoBillKey() { - return autoBillKey; - } - - public void setAutoBillKey(String autoBillKey) { - this.autoBillKey = autoBillKey; - } - - public String getCashGb() { - return cashGb; - } - - public void setCashGb(String cashGb) { - this.cashGb = cashGb; - } - - public String getAutoYn() { - return autoYn; - } - - public void setAutoYn(String autoYn) { - this.autoYn = autoYn; - } - - public String getCommId() { - return commId; - } - - public void setCommId(String commId) { - this.commId = commId; - } - - public String getMobileId() { - return mobileId; - } - - public void setMobileId(String mobileId) { - this.mobileId = mobileId; - } - - public String getMrchId() { - return mrchId; - } - - public void setMrchId(String mrchId) { - this.mrchId = mrchId; - } - - public String getPno() { - return pno; - } - - public void setPno(String pno) { - this.pno = pno; - } - - public String getPayerEmail() { - return payerEmail; - } - - public void setPayerEmail(String payerEmail) { - this.payerEmail = payerEmail; - } - - public String getPrdtNm() { - return prdtNm; - } - - public void setPrdtNm(String prdtNm) { - this.prdtNm = prdtNm; - } - - public String getPrdtPrice() { - return prdtPrice; - } - - public void setPrdtPrice(String prdtPrice) { - this.prdtPrice = prdtPrice; - } - - public String getSignDate() { - return signDate; - } - - public void setSignDate(String signDate) { - this.signDate = signDate; - } - - public String getSvcId() { - return svcId; - } - - public void setSvcId(String svcId) { - this.svcId = svcId; - } - - public String getTradeId() { - return tradeId; - } - - public void setTradeId(String tradeId) { - this.tradeId = tradeId; - } - - public String getUserKey() { - return userKey; - } - - public void setUserKey(String userKey) { - this.userKey = userKey; - } - - public String getMcEzKey() { - return mcEzKey; - } - - public void setMcEzKey(String mcEzKey) { - this.mcEzKey = mcEzKey; - } - - public void setCash(double cash) { - this.cash = cash; - } - - - - public String getCashId() { - return cashId; - } - - public void setCashId(String cashId) { - this.cashId = cashId; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public double getCash() { - return cash; - } - - public void setCash(float cash) { - this.cash = cash; - } - - public double getMinusCash() { - return minusCash; - } - - public void setMinusCash(double minusCash) { - this.minusCash = minusCash; - } - - public String getStrCash() { - return strCash; - } - - public void setStrCash(String strCash) { - this.strCash = strCash; - } - - public String getFrstRegisterId() { - return frstRegisterId; - } - - public void setFrstRegisterId(String frstRegisterId) { - this.frstRegisterId = frstRegisterId; - } - - public String getFrstRegistPnttm() { - return frstRegistPnttm; - } - - public void setFrstRegistPnttm(String frstRegistPnttm) { - this.frstRegistPnttm = frstRegistPnttm; - } - - public String getAdminRegisterId() { - return adminRegisterId; - } - - public void setAdminRegisterId(String adminRegisterId) { - this.adminRegisterId = adminRegisterId; - } - - public String getAdminRegistPnttm() { - return adminRegistPnttm; - } - - public void setAdminRegistPnttm(String adminRegistPnttm) { - this.adminRegistPnttm = adminRegistPnttm; - } - - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public String getMsgGroupId() { - return msgGroupId; - } - - public void setMsgGroupId(String msgGroupId) { - this.msgGroupId = msgGroupId; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public static long getSerialversionuid() { - return serialVersionUID; - } - - public String getSearchCondition2() { - return searchCondition2; - } - - public void setSearchCondition2(String searchCondition2) { - this.searchCondition2 = searchCondition2; - } - - public String getSearchCmpltYn() { - return searchCmpltYn; - } - - public void setSearchCmpltYn(String searchCmpltYn) { - this.searchCmpltYn = searchCmpltYn; - } - - public String getDelFlagTxt() { - return delFlagTxt; - } - - public void setDelFlagTxt(String delFlagTxt) { - this.delFlagTxt = delFlagTxt; - } - - public String getMerchantKey() { - return merchantKey; - } - - public void setMerchantKey(String merchantKey) { - this.merchantKey = merchantKey; - } - - public String getMerchantID() { - return merchantID; - } - - public void setMerchantID(String merchantID) { - this.merchantID = merchantID; - } - - public String getGoodsName() { - return goodsName; - } - - public void setGoodsName(String goodsName) { - this.goodsName = goodsName; - } - - public String getPrice() { - return price; - } - - public void setPrice(String price) { - this.price = price; - } - - public String getBuyerName() { - return buyerName; - } - - public void setBuyerName(String buyerName) { - this.buyerName = buyerName; - } - - public String getBuyerTel() { - return buyerTel; - } - - public void setBuyerTel(String buyerTel) { - this.buyerTel = buyerTel; - } - - public String getBuyerEmail() { - return buyerEmail; - } - - public void setBuyerEmail(String buyerEmail) { - this.buyerEmail = buyerEmail; - } - - public String getMoid() { - return moid; - } - - public void setMoid(String moid) { - this.moid = moid; - } - - public String getReturnURL() { - return returnURL; - } - - public void setReturnURL(String returnURL) { - this.returnURL = returnURL; - } - - public String getPgCode() { - return pgCode; - } - - public void setPgCode(String pgCode) { - this.pgCode = pgCode; - } - - public String getPgStatus() { - return pgStatus; - } - - public void setPgStatus(String pgStatus) { - this.pgStatus = pgStatus; - } - - public String getRegDate() { - return regDate; - } - - public void setRegDate(String regDate) { - this.regDate = regDate; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getOfflineAccount() { - return offlineAccount; - } - - public void setOfflineAccount(String offlineAccount) { - this.offlineAccount = offlineAccount; - } - - public String getOfflineReceipt() { - return offlineReceipt; - } - - public void setOfflineReceipt(String offlineReceipt) { - this.offlineReceipt = offlineReceipt; - } - - public String getTid() { - return tid; - } - - public void setTid(String tid) { - this.tid = tid; - } - - public String getResultCode() { - return resultCode; - } - - public void setResultCode(String resultCode) { - this.resultCode = resultCode; - } - - public String getResultMsg() { - return resultMsg; - } - - public void setResultMsg(String resultMsg) { - this.resultMsg = resultMsg; - } - - public String getMid() { - return mid; - } - - public void setMid(String mid) { - this.mid = mid; - } - - public String getPayMethod() { - return payMethod; - } - - public void setPayMethod(String payMethod) { - this.payMethod = payMethod; - } - - public String getAmt() { - return amt; - } - - public void setAmt(String amt) { - this.amt = amt; - } - - public String getAuthDate() { - return authDate; - } - - public void setAuthDate(String authDate) { - this.authDate = authDate; - } - - public String getAuthCode() { - return authCode; - } - - public void setAuthCode(String authCode) { - this.authCode = authCode; - } - - public String getCardCode() { - return cardCode; - } - - public void setCardCode(String cardCode) { - this.cardCode = cardCode; - } - - public String getCardName() { - return cardName; - } - - public void setCardName(String cardName) { - this.cardName = cardName; - } - - public String getCardQuota() { - return cardQuota; - } - - public void setCardQuota(String cardQuota) { - this.cardQuota = cardQuota; - } - - public String getCardCl() { - return cardCl; - } - - public void setCardCl(String cardCl) { - this.cardCl = cardCl; - } - - public String getCcPartCl() { - return ccPartCl; - } - - public void setCcPartCl(String ccPartCl) { - this.ccPartCl = ccPartCl; - } - - public String getBankCode() { - return bankCode; - } - - public void setBankCode(String bankCode) { - this.bankCode = bankCode; - } - - public String getBankName() { - return bankName; - } - - public void setBankName(String bankName) { - this.bankName = bankName; - } - - public String getRcptType() { - return rcptType; - } - - public void setRcptType(String rcptType) { - this.rcptType = rcptType; - } - - public String getRcptAuthCode() { - return rcptAuthCode; - } - - public void setRcptAuthCode(String rcptAuthCode) { - this.rcptAuthCode = rcptAuthCode; - } - - public String getRcptTid() { - return rcptTid; - } - - public void setRcptTid(String rcptTid) { - this.rcptTid = rcptTid; - } - - public String getCarrier() { - return carrier; - } - - public void setCarrier(String carrier) { - this.carrier = carrier; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getVbankCode() { - return vbankCode; - } - - public void setVbankCode(String vbankCode) { - this.vbankCode = vbankCode; - } - - public String getVbankName() { - return vbankName; - } - - public void setVbankName(String vbankName) { - this.vbankName = vbankName; - } - - public String getVbankNum() { - return vbankNum; - } - - public void setVbankNum(String vbankNum) { - this.vbankNum = vbankNum; - } - - public String getVbankExpDate() { - return vbankExpDate; - } - - public void setVbankExpDate(String vbankExpDate) { - this.vbankExpDate = vbankExpDate; - } - - public String getCancelResultCode() { - return cancelResultCode; - } - - public void setCancelResultCode(String cancelResultCode) { - this.cancelResultCode = cancelResultCode; - } - - public String getCancelResultMsg() { - return cancelResultMsg; - } - - public void setCancelResultMsg(String cancelResultMsg) { - this.cancelResultMsg = cancelResultMsg; - } - - public String getCancelAmt() { - return cancelAmt; - } - - public void setCancelAmt(String cancelAmt) { - this.cancelAmt = cancelAmt; - } - - public String getCancelDate() { - return cancelDate; - } - - public void setCancelDate(String cancelDate) { - this.cancelDate = cancelDate; - } - - public String getCancelTime() { - return cancelTime; - } - - public void setCancelTime(String cancelTime) { - this.cancelTime = cancelTime; - } - - public String getCancelNum() { - return cancelNum; - } - - public void setCancelNum(String cancelNum) { - this.cancelNum = cancelNum; - } - - public String getRegNo() { - return regNo; - } - - public void setRegNo(String regNo) { - this.regNo = regNo; - } - - public String getCompanyName() { - return companyName; - } - - public void setCompanyName(String companyName) { - this.companyName = companyName; - } - - public String getRepName() { - return repName; - } - - public void setRepName(String repName) { - this.repName = repName; - } - - public String getAddr() { - return addr; - } - - public void setAddr(String addr) { - this.addr = addr; - } - - public String getRecvZipcode() { - return recvZipcode; - } - - public void setRecvZipcode(String recvZipcode) { - this.recvZipcode = recvZipcode; - } - - public String getRecvAddr1() { - return recvAddr1; - } - - public void setRecvAddr1(String recvAddr1) { - this.recvAddr1 = recvAddr1; - } - - public String getRecvAddr2() { - return recvAddr2; - } - - public void setRecvAddr2(String recvAddr2) { - this.recvAddr2 = recvAddr2; - } - - public String getBtype() { - return btype; - } - - public void setBtype(String btype) { - this.btype = btype; - } - - public String getBitem() { - return bitem; - } - - public void setBitem(String bitem) { - this.bitem = bitem; - } - - public String getConfirmYn() { - return confirmYn; - } - - public void setConfirmYn(String confirmYn) { - this.confirmYn = confirmYn; - } - - public String getConfirmDate() { - return confirmDate; - } - - public void setConfirmDate(String confirmDate) { - this.confirmDate = confirmDate; - } - - public String getPointId() { - return pointId; - } - - public void setPointId(String pointId) { - this.pointId = pointId; - } - - public int getPoint() { - return point; - } - - public void setPoint(int point) { - this.point = point; - } - - public int getMinusPoint() { - return minusPoint; - } - - public void setMinusPoint(int minusPoint) { - this.minusPoint = minusPoint; - } - - public String getPointMemo() { - return pointMemo; - } - - public void setPointMemo(String pointMemo) { - this.pointMemo = pointMemo; - } - - public boolean isPaySuccess() { - return paySuccess; - } - - public void setPaySuccess(boolean paySuccess) { - this.paySuccess = paySuccess; - } - - public String getPayMethodTxt() { - return payMethodTxt; - } - - public void setPayMethodTxt(String payMethodTxt) { - this.payMethodTxt = payMethodTxt; - } - - public String getPgStatusTxt() { - return pgStatusTxt; - } - - public void setPgStatusTxt(String pgStatusTxt) { - this.pgStatusTxt = pgStatusTxt; - } - - public String getRcptTypeTxt() { - return rcptTypeTxt; - } - - public void setRcptTypeTxt(String rcptTypeTxt) { - this.rcptTypeTxt = rcptTypeTxt; - } - - public String getSearchCondition3() { - return searchCondition3; - } - - public void setSearchCondition3(String searchCondition3) { - this.searchCondition3 = searchCondition3; - } - - public int getCancelCnt() { - return cancelCnt; - } - - public void setCancelCnt(int cancelCnt) { - this.cancelCnt = cancelCnt; - } - - public int getUserMoney() { - return userMoney; - } - - public void setUserMoney(int userMoney) { - this.userMoney = userMoney; - } - - public int getUserPoint() { - return userPoint; - } - - public void setUserPoint(int userPoint) { - this.userPoint = userPoint; - } - - public int getSign() { - return sign; - } - - public void setSign(int sign) { - this.sign = sign; - } - - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } - - public String getDivFlag() { - return divFlag; - } - - public void setDivFlag(String divFlag) { - this.divFlag = divFlag; - } - - public String getPointUseId() { - return pointUseId; - } - - public void setPointUseId(String pointUseId) { - this.pointUseId = pointUseId; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getCmpltYn() { - return cmpltYn; - } - - public void setCmpltYn(String cmpltYn) { - this.cmpltYn = cmpltYn; - } - - public String getBankNm() { - return bankNm; - } - - public void setBankNm(String bankNm) { - this.bankNm = bankNm; - } - - public String getAccountNum() { - return accountNum; - } - - public void setAccountNum(String accountNum) { - this.accountNum = accountNum; - } - - public String getAccountNm() { - return accountNm; - } - - public void setAccountNm(String accountNm) { - this.accountNm = accountNm; - } - - public String getMbtlNum() { - return mbtlNum; - } - - public void setMbtlNum(String mbtlNum) { - this.mbtlNum = mbtlNum; - } - - public String getTaxTrgt() { - return taxTrgt; - } - - public void setTaxTrgt(String taxTrgt) { - this.taxTrgt = taxTrgt; - } - - public String getBtnChk() { - return btnChk; - } - - public void setBtnChk(String btnChk) { - this.btnChk = btnChk; - } - - public String getRefundListType() { - return refundListType; - } - - public void setRefundListType(String refundListType) { - this.refundListType = refundListType; - } - - public String getSumPay() { - return sumPay; - } - - public void setSumPay(String sumPay) { - this.sumPay = sumPay; - } - - public String getAmtCardSum() { - return amtCardSum; - } - - public void setAmtCardSum(String amtCardSum) { - this.amtCardSum = amtCardSum; - } - - public String getAmtCellSum() { - return amtCellSum; - } - - public void setAmtCellSum(String amtCellSum) { - this.amtCellSum = amtCellSum; - } - - public String getAmtBankSum() { - return amtBankSum; - } - - public void setAmtBankSum(String amtBankSum) { - this.amtBankSum = amtBankSum; - } - - public String getAmtVbankSum() { - return amtVbankSum; - } - - public void setAmtVbankSum(String amtVbankSum) { - this.amtVbankSum = amtVbankSum; - } - - public String getAmtTotSum() { - return amtTotSum; - } - - public void setAmtTotSum(String amtTotSum) { - this.amtTotSum = amtTotSum; - } - - public String getNtceBgnde() { - return ntceBgnde; - } - - public void setNtceBgnde(String ntceBgnde) { - this.ntceBgnde = ntceBgnde; - } - - public String getNtceEndde() { - return ntceEndde; - } - - public void setNtceEndde(String ntceEndde) { - this.ntceEndde = ntceEndde; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getCalcBaseM() { - return calcBaseM; - } - - public void setCalcBaseM(String calcBaseM) { - this.calcBaseM = calcBaseM; - } - - public String getCashSum() { - return cashSum; - } - - public void setCashSum(String cashSum) { - this.cashSum = cashSum; - } - - public String getCashVatSum() { - return cashVatSum; - } - - public void setCashVatSum(String cashVatSum) { - this.cashVatSum = cashVatSum; - } - - public String getAfterPayYn() { - return afterPayYn; - } - - public void setAfterPayYn(String afterPayYn) { - this.afterPayYn = afterPayYn; - } - - - public String getEventMoid() { - return eventMoid; - } - - public void setEventMoid(String eventMoid) { - this.eventMoid = eventMoid; - } - - public String getSearchCondition5() { - return searchCondition5; - } - - public void setSearchCondition5(String searchCondition5) { - this.searchCondition5 = searchCondition5; - } - - public String getSmishingYn() { - return smishingYn; - } - - public void setSmishingYn(String smishingYn) { - this.smishingYn = smishingYn; - } - - public String getVipYn() { - return vipYn; - } - - public void setVipYn(String vipYn) { - this.vipYn = vipYn; - } - - public String getOneYearPayCnt() { - return oneYearPayCnt; - } - - public void setOneYearPayCnt(String oneYearPayCnt) { - this.oneYearPayCnt = oneYearPayCnt; - } - - public String getSendUserId() { - return sendUserId; - } - - public void setSendUserId(String sendUserId) { - this.sendUserId = sendUserId; - } - - public String getRecvUserId() { - return recvUserId; - } - - public void setRecvUserId(String recvUserId) { - this.recvUserId = recvUserId; - } - - public String getAdmUserId() { - return admUserId; - } - - public void setAdmUserId(String admUserId) { - this.admUserId = admUserId; - } - - public double getUserMoneyDouble() { - return userMoneyDouble; - } - - public void setUserMoneyDouble(double userMoneyDouble) { - this.userMoneyDouble = userMoneyDouble; - } - - public String getMrctTrdNo() { - return mrctTrdNo; - } - - public void setMrctTrdNo(String mrctTrdNo) { - this.mrctTrdNo = mrctTrdNo; - } - - public String getTrdNo() { - return trdNo; - } - - public void setTrdNo(String trdNo) { - this.trdNo = trdNo; - } + private String totChgPay; // 간편결제분류 } diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index 019a0bd8..9acd36fb 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2119,11 +2119,7 @@ public class MjonPayController { // mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate()); // mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate()); - System.out.println("???"); - System.out.println("mjonPayVO.getStartDate() :: "+mjonPayVO.getStartDate()); - System.out.println("mjonPayVO.getEndDate() :: "+mjonPayVO.getEndDate()); if(!DateUtils.dateChkAndValueChk(mjonPayVO.getStartDate(),mjonPayVO.getEndDate(), 12 )) { - System.out.println("???"); mjonPayVO.setStartDate(DateUtils.getDateDaysAgo(365)); mjonPayVO.setEndDate(DateUtils.getCurrentDate()); }; @@ -2132,6 +2128,10 @@ public class MjonPayController { //결제 리스트 정보 불러오기 List resultList = mjonPayService.selectPayList(mjonPayVO); + + model.addAttribute("totChgPay", resultList.size() > 0 ? resultList.get(0).getTotChgPay() : 0); + + model.addAttribute("resultList", resultList); paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0); model.addAttribute("paginationInfo", paginationInfo); @@ -2203,6 +2203,13 @@ public class MjonPayController { model.addAttribute("resultList", resultList); paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0); model.addAttribute("paginationInfo", paginationInfo); + + model.addAttribute("totChgPay", resultList.size() > 0 ? resultList.get(0).getTotChgPay() : 0); + +// String requestUri = request.getRequestURI(); +// String fileName = requestUri.substring(requestUri.lastIndexOf('/') + 1); +// +// model.addAttribute("fileName", fileName); return "/web/pay/PayListPointAjax"; diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index c0fa44ab..1eac75a6 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -27,6 +27,7 @@ SELECT COUNT(POINT_USE_ID) OVER() AS totCnt, + SUM(A.POINT) OVER() AS totChgPay, A.POINT_USE_ID AS pointUseId, A.POINT_ID AS pointId, A.USER_ID AS userId, diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp index 55927ac7..bdd687f5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp @@ -68,6 +68,8 @@ function usrDeptChk(){ var usrDept = '${loginVO.dept}'; + console.log('usrDept : ', usrDept); + //카카오 알림톡 기업회원 전용체크 if(usrDept != 'c'){ @@ -82,7 +84,53 @@ function usrDeptChk(){ } + /** + * @discripton : 카톡발송 > 알림톡 소개 하단에 버튼 액션 + * 기업회원 체크 + */ +function cntntBtnInfo(stepInfo){ + + + //기업회원 여부 체크 + if(usrDeptChk()){ + if(stepInfo == 'step02'){ + location.href=""; + }else if(stepInfo == 'step03'){ + location.href=""; + + } + } +} + +//step 02 +// + + +// step 03 +// + + + + +
+
+
+

알림

+ +
+
+

카카오톡 알림톡은 기업회원만 전송 가능합니다.
기업회원 전환 페이지로 이동하시겠습니까?

+
+ + +
+
+
+
+ + +
    • diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp index 42229a89..fed19456 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp @@ -35,9 +35,13 @@ function fnLinkPageTab(tabInfo){ var url = ""; if(tabInfo == 'tabSms'){ url = ""; - }else if(tabInfo == 'tabKakao'){ + } + else if(tabInfo == 'tabKakao'){ url = ""; } + else if(tabInfo == 'tabFax'){ + url = ""; + } form.action =url; form.submit(); @@ -54,4 +58,7 @@ function fnLinkPageTab(tabInfo){
    • +
  • + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp index 56a05337..b9f29b6e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp @@ -203,7 +203,8 @@
- 채널 ID 등록하러 가기화살표 +<%-- 채널 ID 등록하러 가기화살표 --%> + 채널 ID 등록하러 가기화살표
@@ -225,7 +226,8 @@
- 알림톡 템플릿 등록하러 가기화살표 +<%-- 알림톡 템플릿 등록하러 가기화살표 --%> + 알림톡 템플릿 등록하러 가기화살표
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp index d658b5d7..7e8c17f7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp @@ -54,24 +54,6 @@ function fnGoFriends(){ - -
-
-
-

알림

- -
-
-

카카오톡 알림톡은 기업회원만 전송 가능합니다.
기업회원 전환 페이지로 이동하시겠습니까?

-
- - -
-
-
-
- -
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp index 8078816e..870b9635 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp @@ -608,7 +608,7 @@ *성명 - " /> + " /> *주민등록번호 @@ -616,7 +616,7 @@ *주소 - " style="width:80%;"/> + " style="width:80%;"/> diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp index 7005bd0f..f29555e5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp @@ -316,7 +316,10 @@ function inputNumberFormatPay(obj) { function inputPagesNumberFormatPay(obj) { $(obj).val($(obj).val().replace(/[^0-9]/g,"")); - $('#casePage').val(numberWithCommas(obj.value)); + $(obj).val(numberWithCommas(obj.value)); +} +function inputPagesNumber(obj) { + $(obj).val($(obj).val().replace(/[^0-9]/g,"")); } function fn_gunClear(){ @@ -720,7 +723,7 @@ function getMberGrdChk() { 연락처 - + @@ -757,7 +760,7 @@ function getMberGrdChk() { 건수 - +

건

diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp index 2c9ec61d..5cee730b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp @@ -187,6 +187,26 @@ function fnShowRefundPrintPopup(){

요금결제내역

+ + +
+ +
+

+ 충전금액 +

+
+

+ 캐시 +

+

+ + 원 +

+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp index 1dd9ba2a..7a25ff24 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp @@ -19,6 +19,13 @@