KICC 거래내역 관리

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

@@ -18,12 +18,16 @@ public class PgKiccPayPtclEntity implements Serializable {
     private String brandId;
     @ApiModelProperty(value = "매장아이디")
     private String storeId;
+    @ApiModelProperty(value = "매장명")
+    private String storeNm;
     @ApiModelProperty(value = "몰아이디")
     private String mallId;
     @ApiModelProperty(value = "결제번호")
     private String paymentNo;
     @ApiModelProperty(value = "거래타입(O:주문,C:취소)")
     private String tranType;
+    @ApiModelProperty(value = "거래타입명")
+    private String tranTypeNm;
     @ApiModelProperty(value = "응답코드")
     private String resCd;
     @ApiModelProperty(value = "응답메시지")

src/main/java/com/oqpo/api/enums/SystemMessageCode.java

@@ -71,6 +71,7 @@ public enum SystemMessageCode {
     ERR_AUTHSTORE (40037, "매장소속 담당자가 아닙니다.", HttpStatus.BAD_REQUEST),
     ERR_CODE_NM (40038, "정의되지 않은 코드명을 사용하였습니다.", HttpStatus.BAD_REQUEST),
     ERR_BO_STORE (40039, "매장정보를 찿을 수 없습니다.", HttpStatus.BAD_REQUEST),
+    ERR_PG_FAIL (40040, "PG 결제 처리중 에러가 발생하였습니다.", HttpStatus.BAD_REQUEST),
     ;
 
 

src/main/java/com/oqpo/api/mapper/sttlmng/KiccPayMngMapper.java

@@ -0,0 +1,26 @@
+package com.oqpo.api.mapper.sttlmng;
+
+
+import com.oqpo.api.entity.settmng.PgKiccPayPtclEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KiccPayMngMapper {
+
+    List<PgKiccPayPtclEntity> selectKiccPayGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,
+                                                    @Param("sTranType") String sTranType, @Param("sAuthNo") String sAuthNo,
+                                                    @Param("fromDt") String fromDt, @Param("toDt") String toDt, GridRequest gridRequest) throws Exception;
+
+    int selectKiccPayGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,
+                             @Param("sTranType") String sTranType, @Param("sAuthNo") String sAuthNo,
+                             @Param("fromDt") String fromDt, @Param("toDt") String toDt) throws Exception;
+
+    PgKiccPayPtclEntity selectPgKiccPayPtcl(@Param("poOrdNo") String poOrdNo) throws Exception;
+
+    int updatePgKiccPayPtcl4Cancel(@Param("userId") String userId, PgKiccPayPtclEntity entity) throws Exception;
+
+}

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

@@ -410,7 +410,7 @@ public class EasypayPaymentService extends CommonService {
                     payInfo.setStoreId(easypayPaymentRequest.getStoreId());
                     payInfo.setMallId(mall_id);
                     // payInfo.setPaymentNo(null); // TODO 결제번호
-                    payInfo.setTranType("O"); // 거래타입(O:주문,C:취소)
+                    payInfo.setTranType("40".equals(mgr_txtype) ? "C" : "O"); // 거래타입(O:주문,C:취소)
                     payInfo.setResCd(res_cd);
                     payInfo.setResMsg(res_msg);
                     payInfo.setCno(r_cno);
@@ -433,14 +433,14 @@ public class EasypayPaymentService extends CommonService {
 
                     //System.out.println("=easypayPaymentRequest.getPayTpCd()====================================>" + easypayPaymentRequest.getPayTpCd());
 
-                    if (PayTpCd.PRE_PAY_CHARGE.getCd().equals(easypayPaymentRequest.getPayTpCd()) //
-                            || PayTpCd.AFTER_PRE_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())
-                            || PayTpCd.PR_APPR_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 선결제/충전
-                        System.out.println("========PayTpCd.PRE_PAY_CHARGE.getCd()===========================");
-                        procPreChargePayment(userId, r_amount, r_pay_type, payInfo, easypayPaymentRequest);
-                    } else if (PayTpCd.AFTER_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 후불(결제)
-                        System.out.println("========PayTpCd.AFTER_PAYMENT.getCd()===========================");
-                        procAfterPayment(userId, r_amount, r_pay_type, payInfo, easypayPaymentRequest);
+                    if (!"40".equals(mgr_txtype)) { // 취소거래가 아닌 경우
+                        if (PayTpCd.PRE_PAY_CHARGE.getCd().equals(easypayPaymentRequest.getPayTpCd()) //
+                                || PayTpCd.AFTER_PRE_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())
+                                || PayTpCd.PR_APPR_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 선결제/충전
+                            procPreChargePayment(userId, r_amount, r_pay_type, payInfo, easypayPaymentRequest);
+                        } else if (PayTpCd.AFTER_PAYMENT.getCd().equals(easypayPaymentRequest.getPayTpCd())) { // 후불(결제)
+                            procAfterPayment(userId, r_amount, r_pay_type, payInfo, easypayPaymentRequest);
+                        }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

src/main/java/com/oqpo/api/service/sttlmng/KiccPayMngService.java

@@ -0,0 +1,106 @@
+package com.oqpo.api.service.sttlmng;
+
+
+import com.oqpo.api.entity.settmng.PgKiccPayPtclEntity;
+import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.sttlmng.KiccPayMngMapper;
+import com.oqpo.api.service.CommonService;
+import com.oqpo.api.service.loanmng.EasypayPaymentService;
+import com.oqpo.api.util.DateUtil;
+import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.loanmng.EasypayPaymentRequest;
+import com.oqpo.api.web.dto.request.sttlmng.KiccPayCancelRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.loanmng.EasypayPaymentResponse;
+import com.oqpo.api.web.dto.response.sttlmng.KiccPayGridResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class KiccPayMngService extends CommonService {
+
+    @Autowired
+    private KiccPayMngMapper kiccPayMngMapper;
+
+    @Autowired
+    private EasypayPaymentService easypayPaymentService;
+
+    public GridResponse selectKiccPayGridList(String sBrandId, String sStoreId, String sTranType, String sAuthNo,
+                                              String fromDt, String toDt, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        fromDt = fromDt == null ? null : fromDt.replace(".", "");
+        toDt = toDt == null ? null : toDt.replace(".", "");
+
+        int gridRecords = kiccPayMngMapper.selectKiccPayGridCnt(sBrandId, sStoreId, sTranType, sAuthNo, fromDt, toDt);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<PgKiccPayPtclEntity> entities = kiccPayMngMapper.selectKiccPayGridList(sBrandId, sStoreId, sTranType, sAuthNo, fromDt, toDt, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> KiccPayGridResponse.builder()
+                        .viewCd("R")
+                        .poOrdNo(m.getPoOrdNo())
+                        .brandId(m.getBrandId())
+                        .storeId(m.getStoreId())
+                        .storeNm(m.getStoreNm())
+                        .mallId(m.getMallId())
+                        .paymentNo(m.getPaymentNo())
+                        .tranType(m.getTranType())
+                        .tranTypeNm(m.getTranTypeNm())
+                        .resCd(m.getResCd())
+                        .resMsg(m.getResMsg())
+                        .cno(m.getCno())
+                        .amount(m.getAmount())
+                        .authNo(m.getAuthNo())
+                        .tranDate(m.getTranDate())
+                        .statCd(m.getStatCd())
+                        .statMsg(m.getStatMsg())
+                        .payType(m.getPayType())
+                        .cardNo(m.getCardNo())
+                        .issuerCd(m.getIssuerCd())
+                        .issuerNm(m.getIssuerNm())
+                        .acquirerCd(m.getAcquirerCd())
+                        .acquirerNm(m.getAcquirerNm())
+                        .installPeriod(m.getInstallPeriod())
+                        .noint(m.getNoint())
+                        .cancelYn(m.getCancelYn())
+                        .cancelDate(m.getCancelDate())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    @Transactional
+    public void procCancel(String userId, HttpServletRequest request, KiccPayCancelRequest kiccPayCancelRequest) throws Exception {
+        PgKiccPayPtclEntity entity = kiccPayMngMapper.selectPgKiccPayPtcl(kiccPayCancelRequest.getPoOrdNo());
+
+        EasypayPaymentRequest easypayPaymentRequest = new EasypayPaymentRequest();
+        easypayPaymentRequest.setEP_tr_cd("00201000");
+        easypayPaymentRequest.setEP_mall_id(entity.getMallId());
+        easypayPaymentRequest.setMgr_txtype("40");
+        easypayPaymentRequest.setMgr_subtype("RF01");
+        easypayPaymentRequest.setOrg_cno(entity.getCno());
+        easypayPaymentRequest.setReq_id(userId);
+        easypayPaymentRequest.setOrg_payment_no(entity.getPoOrdNo());
+
+        EasypayPaymentResponse response = easypayPaymentService.requestPayment(userId, request, easypayPaymentRequest);
+
+        if ("0000".equals(response.getRes_cd())) {
+            entity.setCancelYn("Y");
+            entity.setCancelDate(DateUtil.getCurrentDateTime());
+            kiccPayMngMapper.updatePgKiccPayPtcl4Cancel(userId, entity);
+        } else {
+            throw new GlobalException(SystemMessageCode.ERR_PG_FAIL);
+        }
+
+    }
+
+}

src/main/java/com/oqpo/api/web/controller/sttlmng/KiccPayMngController.java

@@ -0,0 +1,74 @@
+package com.oqpo.api.web.controller.sttlmng;
+
+import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.service.sttlmng.KiccPayMngService;
+import com.oqpo.api.service.sttlmng.SttlStateService;
+import com.oqpo.api.web.dto.request.sttlmng.KiccPayCancelRequest;
+import com.oqpo.api.web.dto.request.sttlmng.KiccPayGridRequest;
+import com.oqpo.api.web.dto.request.sttlmng.SttlConfirmRequest;
+import com.oqpo.api.web.dto.request.sttlmng.SttlStateGridRequest;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.SaveResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/kicc/pay")
+@Api(tags = {"KICC 거래내역 관리 (KiccPayMngController)"})
+public class KiccPayMngController {
+
+    @Autowired
+    private KiccPayMngService kiccPayMngService;
+
+    /**
+     * 설명 : 거래내역 그리드 리스트
+     *
+     * @param kiccPayGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "거내내역 그리드 리스트")
+    @PostMapping("/detail-grid-list")
+    public ResponseEntity<GridResponse> detailGridList(@RequestBody @Valid KiccPayGridRequest kiccPayGridRequest) throws Exception {
+        return ResponseEntity.ok(kiccPayMngService.selectKiccPayGridList(kiccPayGridRequest.getSBrandId(), kiccPayGridRequest.getSStoreId(),
+                kiccPayGridRequest.getSTranType(), kiccPayGridRequest.getSAuthNo(),
+                kiccPayGridRequest.getFromDt(), kiccPayGridRequest.getToDt(), kiccPayGridRequest.toDTO(kiccPayGridRequest)));
+    }
+
+    /**
+     * 설명 : 거래 취소 처리
+     *
+     * @param userId
+     * @param kiccPayCancelRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "거래 취소 처리")
+    @PostMapping("/cancel-proc")
+    public ResponseEntity<SaveResponse> procCancel(@ApiIgnore String userId, HttpServletRequest request,
+                                                   @RequestBody @Valid KiccPayCancelRequest kiccPayCancelRequest) throws Exception {
+        kiccPayMngService.procCancel(userId, request, kiccPayCancelRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+
+}

src/main/java/com/oqpo/api/web/dto/request/sttlmng/KiccPayCancelRequest.java

@@ -0,0 +1,18 @@
+package com.oqpo.api.web.dto.request.sttlmng;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class KiccPayCancelRequest {
+
+    @ApiModelProperty(value = "주문번호")
+    @NotBlank
+    private String poOrdNo;
+
+}

src/main/java/com/oqpo/api/web/dto/request/sttlmng/KiccPayGridRequest.java

@@ -0,0 +1,29 @@
+package com.oqpo.api.web.dto.request.sttlmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class KiccPayGridRequest extends GridRequest {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
+    @ApiModelProperty(value = "거래타입")
+    private String sTranType;
+    @ApiModelProperty(value = "승인번호")
+    private String sAuthNo;
+    @ApiModelProperty(value = "조회시작일자")
+    private String fromDt;
+    @ApiModelProperty(value = "조회종료일자")
+    private String toDt;
+
+    protected KiccPayGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/sttlmng/KiccPayGridResponse.java

@@ -0,0 +1,71 @@
+package com.oqpo.api.web.dto.response.sttlmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class KiccPayGridResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "주문번호")
+    private String poOrdNo;
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+    @ApiModelProperty(value = "매장명")
+    private String storeNm;
+    @ApiModelProperty(value = "몰아이디")
+    private String mallId;
+    @ApiModelProperty(value = "결제번호")
+    private String paymentNo;
+    @ApiModelProperty(value = "거래타입(O:주문,C:취소)")
+    private String tranType;
+    @ApiModelProperty(value = "거래타입명")
+    private String tranTypeNm;
+    @ApiModelProperty(value = "응답코드")
+    private String resCd;
+    @ApiModelProperty(value = "응답메시지")
+    private String resMsg;
+    @ApiModelProperty(value = "PG거래번호")
+    private String cno;
+    @ApiModelProperty(value = "총 결제금액")
+    private String 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;
+
+}

src/main/resources/mybatis/sqlmaps/sttlmng/KiccPayMng.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.sttlmng.KiccPayMngMapper">
+
+    <select id="selectKiccPayGridList" resultType="com.oqpo.api.entity.settmng.PgKiccPayPtclEntity">
+        /* KiccPayMngMapper.selectKiccPayGridList */
+        SELECT A.po_ord_no,
+            A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
+            A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
+            A.mall_id, A.payment_no, A.tran_type, FN_CODE_NM('TRAN_TYPE', A.tran_type) AS tran_type_nm,
+            A.res_cd, A.res_msg, A.cno, A.amount,
+            A.auth_no, A.tran_date, A.stat_cd, A.stat_msg, A.pay_type, A.card_no, A.issuer_cd, A.issuer_nm, A.acquirer_cd,
+            A.acquirer_nm, A.install_period, A.noint, A.cancel_yn, A.cancel_date
+        FROM pg_kicc_pay_ptcl A
+        WHERE A.del_yn = 'N'
+        AND A.brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            AND A.store_id = #{sStoreId}
+        </if>
+        <if test="sTranType != null and sTranType != ''">
+            AND A.tran_type = #{sTranType}
+        </if>
+        <if test="sAuthNo != null and sAuthNo != ''">
+            AND A.auth_no = #{sAuthNo}
+        </if>
+        AND A.tran_date BETWEEN CONCAT(#{fromDt},'000000') AND CONCAT(#{toDt},'235959')
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY A.po_ord_no ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY A.po_ord_no DESC
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                ORDER BY A.po_ord_no ASC
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectKiccPayGridCnt" resultType="int">
+        /* KiccPayMngMapper.selectKiccPayGridCnt */
+        SELECT COUNT(*)
+        FROM pg_kicc_pay_ptcl A
+        WHERE A.del_yn = 'N'
+        AND A.brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            AND A.store_id = #{sStoreId}
+        </if>
+        <if test="sTranType != null and sTranType != ''">
+            AND A.tran_type = #{sTranType}
+        </if>
+        <if test="sAuthNo != null and sAuthNo != ''">
+            AND A.auth_no = #{sAuthNo}
+        </if>
+        AND A.tran_date BETWEEN CONCAT(#{fromDt},'000000') AND CONCAT(#{toDt},'235959')
+    </select>
+
+    <select id="selectPgKiccPayPtcl" resultType="com.oqpo.api.entity.settmng.PgKiccPayPtclEntity">
+        /* KiccPayMngMapper.selectPgKiccPayPtcl */
+        SELECT A.po_ord_no, A.brand_id, A.store_id, A.mall_id, A.payment_no, A.tran_type, A.res_cd, A.res_msg, A.cno,
+            A.amount, A.auth_no, A.tran_date, A.stat_cd, A.stat_msg, A.pay_type, A.card_no, A.issuer_cd, A.issuer_nm,
+            A.acquirer_cd, A.acquirer_nm, A.install_period, A.noint, A.cancel_yn, A.cancel_date,
+            A.del_yn, 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_pay_ptcl A
+        WHERE A.po_ord_no = #{poOrdNo}
+    </select>
+
+    <update id="updatePgKiccPayPtcl4Cancel" >
+        /* KiccPayMngMapper.updatePgKiccPayPtcl4Cancel */
+        UPDATE pg_kicc_pay_ptcl SET
+            cancel_yn = #{entity.cancelYn},
+            cancel_date = #{entity.cancelDate},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+        WHERE po_ord_no = #{entity.poOrdNo}
+    </update>
+
+</mapper>