Merge remote-tracking branch 'origin/master'

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java

@@ -996,6 +996,14 @@ public interface BOOrdrMapper {
     public List<DataMap> selectMbrSubsvcOrdrList(BOOrdrDlvyVO ordrDlvyVO);
 
 
+    /**
+     * 사용자 > 주문완료 > 구독서비스 주문 목록 조회
+     * @param ordrDlvyVO
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectOrdrSubsvcDtllList(BOOrdrDlvyVO ordrDlvyVO);
+
+
     /**
      * 사용자 > 구독서비스 결제 > 구독서비스 주문 상품 목록 조회
      * @param subsvcVO

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java

@@ -1923,7 +1923,13 @@ public class BOOrdrService{
 
         DataMap ordrDtl = mapper.selectOrdrDtl(ordrVO);
 
-        List<DataMap> goodsList = mapper.selectOrdrGoodsDtllList(ordrVO);
+        List<DataMap> goodsList = new ArrayList<>();
+        if("Y".equals(ordrDlvyVO.getSubsvcAt())) {
+            int subsvcInnb = ((BigInteger) ordrDtl.get("subsvcInnb")).intValue();
+            goodsList = mapper.selectOrdrSubsvcDtllList(ordrDlvyVO);
+        } else {
+            goodsList = mapper.selectOrdrGoodsDtllList(ordrVO);
+        }
 
         List<DataMap> dscntList = selectOrdrGoodsDtllDscntList(ordrVO);
 
@@ -1967,7 +1973,7 @@ public class BOOrdrService{
         content.put("refundList", refundList);
         content.put("total", total);
         content.put("mlgAccmlNtcList", mlgAccmlNtcList);
-        content.put("mlgAccmlAmt", goodsList.stream().mapToLong(obj -> (long) obj.get("mlgAmt")).sum());
+        content.put("mlgAccmlAmt", goodsList.stream().mapToLong(obj -> ((Number) obj.get("mlgAmt")).longValue()).sum());
         content.put("totalDscntAmt", dscntList.stream().mapToLong(obj -> ((BigDecimal) obj.get("dscntAmt")).longValue()).sum());
 
         return content;
@@ -5745,6 +5751,7 @@ public class BOOrdrService{
      */
     public Map<String, Object> selectOrdrCompt(BOOrdrVO ordrVO) {
         BOOrdrDlvyVO ordrDlvyVO = new BOOrdrDlvyVO();
+        ordrVO.setSubsvcAt((String) mapper.selectOrdrDtl(ordrVO).get("subsvcAt"));
 
         BeanUtils.copyProperties(ordrVO, ordrDlvyVO);
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrDlvyVO.java

@@ -36,6 +36,8 @@ public class BOOrdrDlvyVO extends AbstractVO {
 
     private String sysDvCd; // 시스템 구분 코드
 
+    private String subsvcAt; // 구독서비스 여부
+
     /** 현재 주문 상태 */
     private String currOrdrSttusCd;
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrVO.java

@@ -151,6 +151,9 @@ public class BOOrdrVO extends AbstractVO {
     /** 장바구니 고유번호 배열 */
     private String[] cartInnbs;
 
+    /** 구독서비스 주문여부 */
+    private String subsvcAt;
+
     /** 구독서비스 고유번호 */
     private String subsvcInnb;
 

src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java

@@ -791,7 +791,10 @@ public class OrdrController {
         });
 
         LinkedHashMap goodsOne = ((List<LinkedHashMap>) paramData.get("goodsList")).get(0);
-        if(goodsOne.containsKey("subsvcInnb")) {
+        Boolean subsvcAt = goodsOne.containsKey("subsvcInnb");
+        if(subsvcAt) {
+            model.addAttribute("subsvcInnb", goodsOne.get("subsvcInnb"));
+
             BOSubsvcVO subsvcVO = new BOSubsvcVO();
             subsvcVO.setSopmalCd((String) goodsOne.get("sopmalCd"));
             subsvcVO.setSubsvcInnb(goodsOne.get("subsvcInnb").toString());
@@ -1084,6 +1087,12 @@ public class OrdrController {
         log.debug("=================insertKcpSetle after ");
 
         model.addAttribute("paramVO", payVO);
+        if ("1".equals(content.get("status"))) { // 에러처리
+            String subsvcInnb = request.getParameter("subsvc_innb");
+            if(subsvcInnb != "") {
+                model.addAttribute("subsvcInnb", subsvcInnb);
+            }
+        }
 
         return "sopmal/ordr/OrdrRspnsKcpPayR";
     }

src/main/java/com/wb/domainserver/domain/sopmal/ordr/vo/OrdrVO.java

@@ -41,9 +41,12 @@ public class OrdrVO extends AbstractVO {
     /** 실패 메세지 */
     private String message;
 
-    /*결제 플랫폼 타입 코드*/
+    /** 결제 플랫폼 타입 코드*/
     private String setlePltfomTyCd;
 
-    /*주문유형*/
+    /** 주문유형*/
     private String ordrTyCd;
+
+    /** 구독서비스 고유번호*/
+    private String subsvcInnb;
 }