Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

src/main/java/com/oqpo/api/entity/settmng/PgKiccBaseInfoEntity.java

@@ -0,0 +1,34 @@
+package com.oqpo.api.entity.settmng;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class PgKiccBaseInfoEntity implements Serializable {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "몰아이디")
+    private String mallId;
+    @ApiModelProperty(value = "사용여부")
+    private String useYn;
+    @ApiModelProperty(value = "몰등록일자")
+    private String mallRegDt;
+    @ApiModelProperty(value = "몰삭제일자")
+    private String mallDelDt;
+    @ApiModelProperty(value = "시스템등록일시")
+    private String sysRegDttm;
+    @ApiModelProperty(value = "시스템등록아이디")
+    private String sysRegId;
+    @ApiModelProperty(value = "시스템변경일시")
+    private String sysChgDttm;
+    @ApiModelProperty(value = "시스템변경아이디")
+    private String sysChgId;
+
+}

src/main/java/com/oqpo/api/entity/settmng/PgKiccPayPtclEntity.java

@@ -0,0 +1,74 @@
+package com.oqpo.api.entity.settmng;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class PgKiccPayPtclEntity implements Serializable {
+
+    @ApiModelProperty(value = "주문번호")
+    private String poOrdNo;
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+    @ApiModelProperty(value = "몰아이디")
+    private String mallId;
+    @ApiModelProperty(value = "결제번호")
+    private String paymentNo;
+    @ApiModelProperty(value = "거래타입(O:주문,C:취소)")
+    private String tranType;
+    @ApiModelProperty(value = "응답코드")
+    private String resCd;
+    @ApiModelProperty(value = "응답메시지")
+    private String resMsg;
+    @ApiModelProperty(value = "PG거래번호")
+    private String cno;
+    @ApiModelProperty(value = "총 결제금액")
+    private Integer amount;
+    @ApiModelProperty(value = "승인번호")
+    private String authNo;
+    @ApiModelProperty(value = "거래일시")
+    private String tranDate;
+    @ApiModelProperty(value = "상태코드")
+    private String statCd;
+    @ApiModelProperty(value = "상태메시지")
+    private String statMsg;
+    @ApiModelProperty(value = "결제수단")
+    private String payType;
+    @ApiModelProperty(value = "카드번호")
+    private String cardNo;
+    @ApiModelProperty(value = "발급사코드")
+    private String issuerCd;
+    @ApiModelProperty(value = "발급사명")
+    private String issuerNm;
+    @ApiModelProperty(value = "매입사코드")
+    private String acquirerCd;
+    @ApiModelProperty(value = "매입사명")
+    private String acquirerNm;
+    @ApiModelProperty(value = "할부개월")
+    private String installPeriod;
+    @ApiModelProperty(value = "무이자여부")
+    private String noint;
+    @ApiModelProperty(value = "취소여부")
+    private String cancelYn;
+    @ApiModelProperty(value = "취소일시")
+    private String cancelDate;
+    @ApiModelProperty(value = "삭제여부")
+    private String delYn;
+    @ApiModelProperty(value = "시스템등록일시")
+    private String sysRegDttm;
+    @ApiModelProperty(value = "시스템등록아이디")
+    private String sysRegId;
+    @ApiModelProperty(value = "시스템변경일시")
+    private String sysChgDttm;
+    @ApiModelProperty(value = "시스템변경아이디")
+    private String sysChgId;
+
+}

src/main/java/com/oqpo/api/mapper/loanmng/UnpaidMngMapper.java

@@ -1,6 +1,8 @@
 package com.oqpo.api.mapper.loanmng;
 
 
+import com.oqpo.api.entity.settmng.PgKiccBaseInfoEntity;
+import com.oqpo.api.entity.settmng.PgKiccPayPtclEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
 import com.oqpo.api.entity.settmng.StlMgntDtlPtclEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
@@ -22,4 +24,8 @@ public interface UnpaidMngMapper {
 
     List<StlMgntDtlPtclEntity> selectStlMgntDtlPtclList(@Param("sttlMgntUnqNo") String sttlMgntUnqNo) throws Exception;
 
+    PgKiccBaseInfoEntity selectPgKiccBaseInfo(@Param("brandId") String brandId) throws Exception;
+
+    int insertPgKiccPayPtcl(@Param("userId") String userId, PgKiccPayPtclEntity entity) throws Exception;
+
 }

src/main/java/com/oqpo/api/service/loanmng/EasypayPaymentService.java

@@ -3,6 +3,7 @@ package com.oqpo.api.service.loanmng;
 
 import com.kicc.EasyPayClient;
 import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.settmng.PgKiccBaseInfoEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.loanmng.UnpaidMngMapper;
@@ -58,14 +59,10 @@ public class EasypayPaymentService extends CommonService {
         response.setPoOrdNo(fnGetDealNo(36, ""));
 
         // 2. PG 관련 정보
-        BrandEntity brandInfo = brandMapper.selectBrandInfo(easypayPaymentCreateRequest.getBrandId());
-        response.setPgId(brandInfo.getPgId());
-        response.setPgKey(brandInfo.getPgKey());
-        response.setPgAfflId(brandInfo.getPgAfflId());
+        PgKiccBaseInfoEntity pgInfo = unpaidMngMapper.selectPgKiccBaseInfo(easypayPaymentCreateRequest.getBrandId());
+        response.setMallId(pgInfo.getMallId());
 
-        // TODO 3. 이지페이 결제요청 데이터 생성
-
-        // 4. 사용자정보 조회 및 매핑
+        // 3. 사용자정보 조회 및 매핑
         UserMngEntity userInfo = userMngMapper.selectUserInfo(userId);
         response.setOrdNm(userInfo.getUserNm()); // 구매자명
         response.setGoodsNm(easypayPaymentCreateRequest.getStoreId() //
@@ -74,7 +71,7 @@ public class EasypayPaymentService extends CommonService {
         response.setOrdTel(StringUtil.isEmpty(userInfo.getTelNo()) && userInfo.getTelNo().startsWith("010") ? userInfo.getTelNo() : null); // 휴대전화번호
         response.setOrdEmail(userInfo.getEmail()); // 이메일
 
-        // 5. 이지페이 결제 URL 매핑
+        // 4. 이지페이 결제 URL 매핑
         response.setKicc_javascript_url(kiccJavaScriptUrl);
         response.setKicc_action_web_url(kiccActionWebUrl);
         response.setKicc_action_mobile_url(kiccActionMobileUrl);

src/main/java/com/oqpo/api/web/dto/response/loanmng/EasypayPaymentCreateResponse.java

@@ -9,12 +9,8 @@ public class EasypayPaymentCreateResponse {
     @ApiModelProperty(value = "수발주주문번호")
     private String poOrdNo;
 
-    @ApiModelProperty(value = "PG사아이디")
-    private String pgId;
-    @ApiModelProperty(value = "PG KEY")
-    private String pgKey;
-    @ApiModelProperty(value = "PG 가맹점아이디")
-    private String pgAfflId;
+    @ApiModelProperty(value = "몰아이디")
+    private String mallId;
 
     @ApiModelProperty(value = "상품명")
     private String goodsNm;

src/main/resources/mybatis/sqlmaps/loanmng/UnpaidMng.xml

@@ -161,4 +161,31 @@
         ORDER BY A.sttl_mgnt_dtl_no ASC
     </select>
 
+    <select id="selectPgKiccBaseInfo" resultType="com.oqpo.api.entity.settmng.PgKiccBaseInfoEntity">
+        /* UnpaidMngMapper.selectPgKiccBaseInfo */
+        SELECT A.brand_id, A.mall_id, A.use_yn, A.mall_reg_dt, A.mall_del_dt,
+            DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id,
+            DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id
+        FROM pg_kicc_base_info A
+        WHERE A.brand_id = #{brandId}
+          AND A.use_yn = 'Y'
+        ORDER BY A.sys_reg_dttm DESC
+        LIMIT 1
+    </select>
+
+    <insert id="insertPgKiccPayPtcl" >
+        /* UnpaidMngMapper.insertPgKiccPayPtcl */
+        INSERT INTO pg_kicc_pay_ptcl
+            (po_ord_no, brand_id, store_id, mall_id, payment_no, tran_type, res_cd, res_msg, cno, amount, auth_no,
+             tran_date, stat_cd, stat_msg, pay_type, card_no, issuer_cd, issuer_nm, acquirer_cd, acquirer_nm,
+             install_period, noint, cancel_yn, cancel_date, sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        VALUES
+            (#{entity.poOrdNo}, #{entity.brandId}, #{entity.storeId}, #{entity.mallId}, #{entity.paymentNo},
+             #{entity.tranType}, #{entity.resCd}, #{entity.resMsg}, #{entity.cno}, #{entity.amount},
+             #{entity.authNo}, #{entity.tranDate}, #{entity.statCd}, #{entity.statMsg}, #{entity.payType},
+             #{entity.cardNo}, #{entity.issuerCd}, #{entity.issuerNm}, #{entity.acquirerCd}, #{entity.acquirerNm},
+             #{entity.installPeriod}, #{entity.noint}, #{entity.cancelYn}, #{entity.cancelDate},
+             NOW(), #{userId}, NOW(), #{userId})
+    </insert>
+
 </mapper>