marseyes 2 gadi atpakaļ
vecāks
revīzija
099d6e5f92

+ 23 - 0
src/main/java/com/oqpo/api/service/sttlmng/SttlStateService.java

@@ -2,14 +2,19 @@ package com.oqpo.api.service.sttlmng;
2 2
 
3 3
 
4 4
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
5
+import com.oqpo.api.enums.SttlStCd;
6
+import com.oqpo.api.mapper.sttlmng.SttlReqMapper;
5 7
 import com.oqpo.api.mapper.sttlmng.SttlStateMapper;
6 8
 import com.oqpo.api.service.CommonService;
9
+import com.oqpo.api.util.DateUtil;
7 10
 import com.oqpo.api.web.dto.request.GridRequest;
11
+import com.oqpo.api.web.dto.request.sttlmng.SttlConfirmRequest;
8 12
 import com.oqpo.api.web.dto.response.GridResponse;
9 13
 import com.oqpo.api.web.dto.response.sttlmng.SttlStateGridResponse;
10 14
 import lombok.extern.slf4j.Slf4j;
11 15
 import org.springframework.beans.factory.annotation.Autowired;
12 16
 import org.springframework.stereotype.Service;
17
+import org.springframework.transaction.annotation.Transactional;
13 18
 
14 19
 import java.util.List;
15 20
 import java.util.stream.Collectors;
@@ -21,6 +26,9 @@ public class SttlStateService extends CommonService {
21 26
     @Autowired
22 27
     private SttlStateMapper sttlStateMapper;
23 28
 
29
+    @Autowired
30
+    private SttlReqMapper sttlReqMapper;
31
+
24 32
     /*
25 33
       정산요청 그리드 리스트 조회
26 34
      */
@@ -59,4 +67,19 @@ public class SttlStateService extends CommonService {
59 67
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
60 68
     }
61 69
 
70
+    /* 정산완료  */
71
+    @Transactional
72
+    public void endSttl(String userId, SttlConfirmRequest sttlConfirmRequest) throws Exception {
73
+        // 정산기본정보 조회
74
+        StlMgntBaseInfoEntity entity = sttlReqMapper.selectStlMgntBaseInfo(sttlConfirmRequest.getSttlMgntUnqNo());
75
+
76
+        // 정산관리기본정보 - 정산상태코드 변경
77
+        StlMgntBaseInfoEntity infoEntity = new StlMgntBaseInfoEntity();
78
+        infoEntity.setSttlMgntUnqNo(sttlConfirmRequest.getSttlMgntUnqNo());
79
+        infoEntity.setSttlStCd(SttlStCd.STTL_CONFIRM.getCd());
80
+        infoEntity.setSttlDt(DateUtil.getCurrentDate());
81
+        infoEntity.setSttlAmt(entity.getSttlReqAmt()); // 정산요청금액을 정산금액으로 지정한다.
82
+        sttlReqMapper.updateStlMgntBaseInfo4SttlConfirm(userId, infoEntity);
83
+    }
84
+
62 85
 }

+ 22 - 0
src/main/java/com/oqpo/api/web/controller/sttlmng/SttlStateController.java

@@ -1,8 +1,11 @@
1 1
 package com.oqpo.api.web.controller.sttlmng;
2 2
 
3
+import com.oqpo.api.enums.SystemMessageCode;
3 4
 import com.oqpo.api.service.sttlmng.SttlStateService;
5
+import com.oqpo.api.web.dto.request.sttlmng.SttlConfirmRequest;
4 6
 import com.oqpo.api.web.dto.request.sttlmng.SttlStateGridRequest;
5 7
 import com.oqpo.api.web.dto.response.GridResponse;
8
+import com.oqpo.api.web.dto.response.SaveResponse;
6 9
 import io.swagger.annotations.Api;
7 10
 import io.swagger.annotations.ApiImplicitParam;
8 11
 import io.swagger.annotations.ApiImplicitParams;
@@ -11,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
11 14
 import org.springframework.beans.factory.annotation.Autowired;
12 15
 import org.springframework.http.ResponseEntity;
13 16
 import org.springframework.web.bind.annotation.*;
17
+import springfox.documentation.annotations.ApiIgnore;
14 18
 
15 19
 import javax.validation.Valid;
16 20
 
@@ -41,4 +45,22 @@ public class SttlStateController {
41 45
                 sttlStateGridRequest.getFromDt(), sttlStateGridRequest.getToDt(), sttlStateGridRequest.toDTO(sttlStateGridRequest)));
42 46
     }
43 47
 
48
+    /**
49
+     * 설명 : 정산완료
50
+     *
51
+     * @param userId
52
+     * @param sttlConfirmRequest
53
+     * @return SaveResponse
54
+     * @throws Exception
55
+     */
56
+    @ApiImplicitParams({
57
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
58
+    })
59
+    @ApiOperation(value = "정산완료")
60
+    @PostMapping("/sttl-end")
61
+    public ResponseEntity<SaveResponse> confirmSttl(@ApiIgnore String userId, @RequestBody @Valid SttlConfirmRequest sttlConfirmRequest) throws Exception {
62
+        sttlStateService.endSttl(userId, sttlConfirmRequest);
63
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
64
+    }
65
+
44 66
 }