Merge branch 'dev' of https://github.com/Tea-Bliss/BE_Tea_Bliss into dev

src/main/java/store/teabliss/payment/controller/PaymentController.java

@@ -13,9 +13,12 @@
 import org.springframework.web.bind.annotation.*;
 
 import store.teabliss.member.entity.MemberDetails;
+import store.teabliss.payment.dto.PaymentRequestDto;
 import store.teabliss.payment.dto.PaymentResponseDto;
 import store.teabliss.payment.service.PaymentService;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequiredArgsConstructor
@@ -48,6 +51,17 @@ public ResponseEntity<?> payment(@RequestParam ("paymentId") String paymentId,@A
         return ResponseEntity.ok(portone);
 
 
+    }
+
+    @GetMapping("/")
+    @Operation(summary = "결제 내역  조회", description = "결제 내역 조회입니다.")
+    public ResponseEntity<?> getpayment(@AuthenticationPrincipal MemberDetails memberDetails){
+
+        List<PaymentRequestDto> result=paymentService.getpayment(memberDetails.getMemberId());
+
+
+        return ResponseEntity.ok(result);
+
 
 
     }

src/main/java/store/teabliss/payment/dto/PaymentRequestDto.java

@@ -0,0 +1,33 @@
+package store.teabliss.payment.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+import store.teabliss.payment.entity.DBProduct;
+import store.teabliss.review.entity.Review;
+
+import java.util.List;
+
+
+@Builder
+@Getter
+@ToString
+public class PaymentRequestDto {
+
+    private Long paymentid;
+
+
+    private List<Object> productList;
+
+
+    private String paidAt;
+
+
+
+    public static PaymentRequestDto of(Long paymentid,List<Object> productList,String paidAt) {
+        return PaymentRequestDto.builder().paymentid(paymentid)
+                                .productList(productList)
+                .paidAt(paidAt)
+                .build();
+    }
+}

src/main/java/store/teabliss/payment/entity/DBPayment.java

@@ -19,7 +19,7 @@ public class DBPayment {
 
     private String orderName;
 
-    private LocalDateTime paidAt;
+    private String paidAt;
 
 
 

src/main/java/store/teabliss/payment/entity/DBProduct.java

@@ -2,8 +2,13 @@
 
 
 import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
 
 @Builder
+@Getter
+@Setter
+
 public class DBProduct {
 
     private Long payId;

src/main/java/store/teabliss/payment/mapper/PaymentMapper.java

@@ -3,6 +3,8 @@
 import org.apache.ibatis.annotations.Mapper;
 import store.teabliss.payment.entity.*;
 
+import java.util.List;
+
 @Mapper
 public interface PaymentMapper {
 
@@ -14,5 +16,9 @@ public interface PaymentMapper {
    void savecustomer(DBCustomer dbCustomer);
    void savecard(DBCard dbCard);
 
+   List<DBPayment> searchpayid(Long id);
+   List<DBProduct> searchprodcut(Long paymentId);
+
+
 
 }

src/main/java/store/teabliss/payment/service/PaymentService.java

@@ -3,19 +3,24 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import store.teabliss.basket.mapper.BasketMapper;
+import store.teabliss.payment.dto.PaymentRequestDto;
 import store.teabliss.payment.dto.PaymentResponseDto;
 import store.teabliss.payment.entity.*;
 import store.teabliss.payment.mapper.PaymentMapper;
+import store.teabliss.review.entity.Review;
+import store.teabliss.review.mapper.ReviewMapper;
 import store.teabliss.tea.mapper.TeaMapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Slf4j
@@ -27,6 +32,7 @@ public class PaymentService {
     private final TeaMapper teaMapper;
     private final BasketMapper basketMapper;
     private final PaymentMapper paymentMapper;
+    private final ReviewMapper reviewMapper;
 
     //amount 설정
     PayAmount payAmount=new PayAmount();
@@ -38,12 +44,16 @@ public class PaymentService {
     //webclient 설정
     WebClient client=WebClient.create("https://api.portone.io/payments");
 
+    @Value("${portone.beartoken}")
+    private String token;
+
     public PaymentResponseDto portone(String paymentId){
 
+
         // api 요청
         Mono<PaymentResponseDto> result=client.get()
                 .uri("/{paymentId}",paymentId)
-                .header("Authorization", "PortOne SMS7u8BYzRSw2qJzBaHnkUowNREOWJgkCBW13xRBFNixOOdZC5mKubNuADhwW0qMWLXZrUPM3H4Hb7je")
+                .header("Authorization", token)
                 .accept(MediaType.APPLICATION_JSON)
                 .retrieve()
                 .bodyToMono(PaymentResponseDto.class);
@@ -94,7 +104,7 @@ public boolean payment(PaymentResponseDto paymentResponseDto,Long memId){
 
             //inventory 변경
             teaMapper.updateinventory(name, quantity);
-            //basket 변경
+            //판매수량 변경
             teaMapper.updatesale(name, quantity);
 
             String result=basketMapper.search(name,memId);
@@ -161,5 +171,49 @@ public boolean payment(PaymentResponseDto paymentResponseDto,Long memId){
 
 
 
+    }
+
+
+    public List<PaymentRequestDto> getpayment(Long id){
+
+        //일단 payment의 고유 아이디 구해서
+        List<DBPayment> payment=paymentMapper.searchpayid(id);
+
+        List<PaymentRequestDto> paymentRequestDtos =new ArrayList<>();
+
+        for (DBPayment pay:payment) {
+            //그중에서 모든 구매 prodcut 구하고
+            Long paymentId= pay.getId();
+            List<DBProduct> products = paymentMapper.searchprodcut(pay.getId());
+            List<Object> finalproducts=new ArrayList<>();
+
+            for (DBProduct product : products){
+                Map<String,Object> response=new HashMap<>();
+
+                String name= product.getName();
+                Long findId=teaMapper.findByidandname(name);
+
+                boolean reviewok=reviewMapper.findByteaidandmember(findId,id);
+
+                response.put("review",reviewok);
+                response.put("product",product);
+
+                finalproducts.add(response);
+
+            }
+
+            //paid_at 도 구한다.
+
+            String paid_at = pay.getPaidAt();
+            paymentRequestDtos.add(PaymentRequestDto.of(paymentId,finalproducts,paid_at));
+
+
+        }
+
+        return paymentRequestDtos;
+
+
+
+
     }
 }

src/main/java/store/teabliss/review/mapper/ReviewMapper.java

@@ -23,4 +23,6 @@ public interface ReviewMapper {
 
     void updateReview(Review review);
 
+    boolean findByteaidandmember(Long tea_id,Long mem_id);
+
 }

src/main/java/store/teabliss/tea/mapper/TeaMapper.java

@@ -73,6 +73,8 @@ public interface TeaMapper {
 
     void deleteFlavor(Long tea_id);
 
+    Long findByidandname(String name);
+
 
 
 }

src/main/resources/application.yml

@@ -38,4 +38,6 @@ jwt:
 #            client_secret: ${GOOGLE_CLIENT_SECRET}
 #            scope: # 기본 값 openid,profile,email => profile, email 로 설정 변경
 #              - profile
-#              - email
+#              - emailportone:
+portone:
+  beartoken: ${PORTONE_BEARTOKEN}

src/main/resources/mapper/PaymentMapper.xml

@@ -30,6 +30,17 @@
         VALUES (#{payId},#{name})
     </insert>
 
+    <select id="searchpayid">
+        SELECT *
+        FROM PAYMENT
+        WHERE mem_id=#{id}
+    </select>
+
+    <select id="searchprodcut">
+        SELECT *
+        FROM PAYPRODUCT
+        WHERE pay_Id=#{payment_id}
+    </select>
 
 
 

src/main/resources/mapper/ReviewMapper.xml

@@ -130,5 +130,12 @@
         AND tea_id = #{teaId}
     </update>
 
+    <select id="findByteaidandmember"  resultType="boolean">
+        SELECT IF(COUNT(*) = 1, 1, 0)
+        FROM REVIEW
+        WHERE mem_id = #{mem_id} AND tea_id=#{tea_id}
+
+    </select>
+
 </mapper>
 

src/main/resources/mapper/TeaMapper.xml

@@ -94,14 +94,14 @@
     <select id="findByIngredient">
         SELECT ingredient_id
         FROM TEAINGREDIENT
-        WHERE tea_id =#{id} AND delete_yn=0
+        WHERE tea_id =#{id}
 
     </select>
 
     <select id="findByFlavor">
         SELECT flavor_id
         FROM TEAFLAVOR
-        WHERE tea_id =#{id} AND delete_yn=0
+        WHERE tea_id =#{id}
 
     </select>
 
@@ -225,6 +225,11 @@
         DELETE FROM TEAFLAVOR
         WHERE tea_id=#{tea_id}
     </delete>
+    <select id="findByidandname">
+        SELECT id
+        FROM TEA
+        WHERE name=#{name}
+    </select>
 
 
 </mapper>