浏览代码

이태영 - 20210423 USAFE 보증보험 개발 중

xodud1202 5 年之前
父节点
当前提交
e69159476a

+ 50 - 25
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -1,6 +1,7 @@
 package com.style24.front.biz.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -18,13 +19,16 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import com.gagaframework.web.parameter.GagaMap;
 import com.kcp.J_PP_CLI_N;
 import com.style24.core.biz.dao.TscOrderDao;
+import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.biz.service.TscKakaoPayService;
 import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.front.biz.dao.TsfOrderDao;
+import com.style24.front.biz.dao.TsfRendererDao;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Cart;
+import com.style24.persistence.domain.CommonCode;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.GiftCard;
 import com.style24.persistence.domain.KakaoPay;
@@ -67,6 +71,9 @@ public class TsfOrderService {
 	@Autowired
 	private TsfCartService cartService;
 
+	@Autowired
+	private TsfRendererDao rendererDao;
+
 	@Autowired
 	private Environment env;
 
@@ -699,12 +706,11 @@ public class TsfOrderService {
 	 * temp.setItemNmArr(goodsNameArr);			// 상품명 배열
 	 * temp.setGoodsPriceArr(goodsPriceArr);	// 상품별 가격 배열
 	 * temp.setItemQtyArr(goodsQuantityArr);	// 상품별 수량 배열
-	 * temp.setCustId("xodud1202");				// 고객 ID
 	 * temp.setOrdNo(1);						// 주문번호
 	 * temp.setRealOrdAmt(32000);				// 결제금액
 	 * temp.setBirthYmd("198912021");			// 생년월일 + 성별(남자 : 1, 여자 : 2)
 	 * temp.setPayMeans(TscConstants.PayMeans.ACCOUNT_TRANSFER.value());		// 무통장입금 or 계좌이체
-	 * temp.setBankCd("BK88");					// 은행코드 (BK + 은행코드)
+	 * temp.setBankNm("신한은행");				// 은행명  >> PG 송부 후 result에서 값 입력하면됨
 	 * temp.setOrdNm("이태영");					// 주문자명
 	 * temp.setOrdTelno("");					// 주문자전화1 ("-" 포함)
 	 * temp.setOrdPhnno("010-7111-4489");		// 주문자전화2 ("-" 포함)
@@ -714,9 +720,10 @@ public class TsfOrderService {
 	 * temp.setRecipNm("이태영");				// 수령인명
 	 * temp.setRecipTelno("");					// 수령인전화번호
 	 * temp.setRecipPhnno("010-7111-4489");		// 수령인휴대폰번호
+	 * temp.setCustNo(100010);					// 고객번호
 	 *
 	 * 	* 계좌이체 : pgTid, 무통장입금 : 가상계좌번호 *
-	 * temp.setPgTid("20210423952698");			// temp.setVaNo("110242222222");
+	 * temp.setPgTid("20210423952698");			// temp.setVaNo("110242222222");  >> PG 송부 후 result에서 값 입력하면됨
 	 *
 	 * @param param
 	 * @author xodud1202
@@ -726,21 +733,24 @@ public class TsfOrderService {
 		InsuranceManager manager = new InsuranceManager("http://gateway.usafe.co.kr/esafe/guartrn.asp" , null );
 
 		InsuranceInfo dInfo = new InsuranceInfo();
+
 		String gubun = "A0";		// 고정
 		String payMethod = "";
+		String payInfo2 = "";
 		String sign = "YYY";
 
 		if(TscConstants.PayMeans.ACCOUNT_TRANSFER.value().equals(param.getPayMeans())) {
 			payMethod = "BMC";
+			payInfo2 = param.getPgTid();
+			param.setIfYn("Y");				// 인터페이스 송부 완료(입금확인)
 		} else if (TscConstants.PayMeans.BANK_DEPOSIT.value().equals(param.getPayMeans())) {
-			payMethod = "MON";
-		} else {
-			return "FAIL";
+			payMethod = "CAS";
+			payInfo2 = param.getVaNo();
+			param.setIfYn("N");				// 인터페이스 송부 완료X (입금확인시 Y로 UPDATE 예정)
 		}
 
-		if(StringUtils.isEmpty(param.getOrdTelno())) {
-			param.setOrdTelno(param.getOrdPhnno());
-		}
+		if(StringUtils.isEmpty(param.getOrdTelno())) {	param.setOrdTelno(param.getOrdPhnno());	}
+		if(StringUtils.isEmpty(param.getRecipTelno())) {	param.setRecipTelno(param.getRecipPhnno());	}
 
 		param.setRecipZipcode(param.getRecipZipcode().replaceAll("-", ""));
 		if(param.getRecipZipcode().length() < 6) {
@@ -750,29 +760,44 @@ public class TsfOrderService {
 		param.setGoodsCnt(String.valueOf(param.getItemNmArr().length));
 
 		dInfo.setGubun(gubun);
-		dInfo.setMallId(param.getCustId());
+		dInfo.setMallId(env.getProperty("usafe.guarantee.mall.id"));
 		dInfo.setOId(String.valueOf(param.getOrdNo()));
 		dInfo.setTotalMoney(String.valueOf(param.getRealOrdAmt()));
 		dInfo.setPId(param.getBirthYmd());
 		dInfo.setPayMethod(payMethod);
-		/*dInfo.setPayInfo1(payInfo1);
+		dInfo.setPayInfo1(param.getBankNm());
 		dInfo.setPayInfo2(payInfo2);
-		dInfo.setOrderNm(orderNm);
-		dInfo.setOrderHomeTel(orderHomeTel);
-		dInfo.setOrderHpTel(orderHpTel);
-		dInfo.setOrderZip(orderZip);
-		dInfo.setOrderAddress(orderAddress);
-		dInfo.setOrderEmail(orderEmail);
-		dInfo.setGoodsCount(goodsCount);
-		dInfo.setAcceptor(acceptor);
-		dInfo.setDeliveryTel1(deliveryTel1);
-		dInfo.setDeliveryTel2(deliveryTel2);
-		dInfo.setGoodsNameArr(goodsNameArr);
-		dInfo.setGoodsPriceArr(goodsPriceArr);
-		dInfo.setGoodsQuantityArr(goodsQuantityArr);
+		dInfo.setOrderNm(param.getOrdNm());
+		dInfo.setOrderHomeTel(param.getOrdTelno());
+		dInfo.setOrderHpTel(param.getOrdPhnno());
+		dInfo.setOrderZip(param.getRecipZipcode());
+		dInfo.setOrderAddress(param.getRecipAddr());
+		dInfo.setOrderEmail(param.getOrdEmail());
+		dInfo.setGoodsCount(param.getGoodsCnt());
+		dInfo.setAcceptor(param.getRecipNm());
+		dInfo.setDeliveryTel1(param.getRecipTelno());
+		dInfo.setDeliveryTel2(param.getRecipPhnno());
+		dInfo.setGoodsNameArr(param.getItemNmArr());
+		dInfo.setGoodsPriceArr(param.getGoodsPriceArr());
+		dInfo.setGoodsQuantityArr(param.getItemQtyArr());
 		dInfo.setSign(sign);
 
-		result = manager.contractInsurance(dInfo);*/
+		String result = manager.contractInsurance(dInfo);
+
+		// result : 0|주문번호		, 성공시
+		// result : 1|Error Message	, 실패시
+		String[] rtnResult = result.split("[\u007C]");
+
+		param.setResultCd(rtnResult[0]);
+		param.setResultMsg(rtnResult[1]);
+
+		if("0".equals(param.getResultCd())) {
+			param.setInsNo(param.getResultMsg());
+		} else {
+			param.setIfYn("F");			// 인터페이스 송부 실패
+		}
+
+		coreOrderDao.createInsurance(param);
 
 		return "SUCCESS";
 	}

+ 6 - 6
src/main/java/com/style24/front/biz/web/TsfCartController.java

@@ -170,15 +170,14 @@ public class TsfCartController extends TsfBaseController {
 		temp.setItemNmArr(goodsNameArr);		// 상품명 배열
 		temp.setGoodsPriceArr(goodsPriceArr);	// 상품별 가격 배열
 		temp.setItemQtyArr(goodsQuantityArr);	// 상품별 수량 배열
-		temp.setCustId("xodud1202");			// 고객 ID
-		temp.setOrdNo(1);						// 주문번호
-		temp.setRealOrdAmt(32000);				// 결제금액
+		temp.setOrdNo(6);						// 주문번호
+		temp.setRealOrdAmt(10200);				// 결제금액
 		temp.setBirthYmd("198912021");			// 생년월일 + 성별(남자 : 1, 여자 : 2)
-		temp.setPayMeans(TscConstants.PayMeans.ACCOUNT_TRANSFER.value());		// 무통장입금 or 계좌이체
-		temp.setBankCd("BK88");					// 은행코드 (BK + 은행코드)
+		temp.setPayMeans(TscConstants.PayMeans.BANK_DEPOSIT.value());		// 무통장입금 or 계좌이체
+		temp.setBankNm("신한은행");					// 은행코드
 
 		/* 무통장입금 : 가상계좌번호, 계좌이체 : pgTid */
-		temp.setPgTid("20210423952698");		// temp.setAccountNo("110242212990");
+		temp.setVaNo("26190167204848");
 		temp.setOrdNm("이태영");				// 주문자명
 		temp.setOrdTelno("");					// 주문자전화1 ("-" 포함)
 		temp.setOrdPhnno("010-7111-4489");		// 주문자전화2 ("-" 포함)
@@ -188,6 +187,7 @@ public class TsfCartController extends TsfBaseController {
 		temp.setRecipNm("이태영");				// 수령인명
 		temp.setRecipTelno("");					// 수령인전화번호
 		temp.setRecipPhnno("010-7111-4489");	// 수령인휴대폰번호
+		temp.setCustNo(100010);
 		orderService.uSafeGuaranteeInsurance(temp);
 
 		return super.getDeviceViewName("cart/CartListAjaxForm");

+ 2 - 0
src/main/resources/config/application-locd.yml

@@ -54,6 +54,8 @@ upload:
 
 download.path: /WIDE/workspace/files/data
 
+usafe.guarantee.mall.id: TEST00
+
 # PG
 pg:
     kcp:

+ 2 - 0
src/main/resources/config/application-run.yml

@@ -61,6 +61,8 @@ mail:
     image.url: http://www.style24.com/image/mailing
     template.path: /app/was/deploy/wivismall.front/WEB-INF/mail
 
+usafe.guarantee.mall.id: istyle2400
+
 # PG
 pg:
     kcp:

+ 2 - 0
src/main/resources/config/application-tsit.yml

@@ -54,6 +54,8 @@ upload:
 
 download.path: /TSIT/servers/files/data
 
+usafe.guarantee.mall.id: TEST00
+
 # PG
 pg:
     kcp: