미납금관리

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

@@ -1,34 +1,17 @@
 package com.oqpo.api.service.loanmng;
 
 
-import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
-import com.oqpo.api.entity.loanmng.LoanMgntDsptProcEntity;
-import com.oqpo.api.entity.loanmng.LoanMgntDtlHstEntity;
-import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.settmng.StlMgntBaseInfoEntity;
 import com.oqpo.api.entity.settmng.StlMgntDtlPtclEntity;
-import com.oqpo.api.enums.DpstPayDvsn;
-import com.oqpo.api.enums.DpstStCd;
-import com.oqpo.api.enums.MediaDvsn;
-import com.oqpo.api.exception.GlobalException;
-import com.oqpo.api.mapper.loanmng.DsptMngMapper;
 import com.oqpo.api.mapper.loanmng.UnpaidMngMapper;
-import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.service.CommonService;
-import com.oqpo.api.util.DateUtil;
 import com.oqpo.api.web.dto.request.GridRequest;
-import com.oqpo.api.web.dto.request.loanmng.ApproveDsptRequest;
-import com.oqpo.api.web.dto.request.loanmng.RejectDsptRequest;
-import com.oqpo.api.web.dto.request.loanmng.RemoveDsptRequest;
-import com.oqpo.api.web.dto.request.loanmng.ReqDsptRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
-import com.oqpo.api.web.dto.response.loanmng.DsptMngInfoResponse;
-import com.oqpo.api.web.dto.response.loanmng.DsptMngListResponse;
 import com.oqpo.api.web.dto.response.loanmng.UnpaidMngInfoResponse;
+import com.oqpo.api.web.dto.response.loanmng.UnpaidMngListResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -40,13 +23,10 @@ public class UnpaidMngService extends CommonService {
     @Autowired
     private UnpaidMngMapper unpaidMngMapper;
 
-    @Autowired
-    private UserMngMapper userMngMapper;
-
     /*
       미납금관리 그리드 리스트 조회
      */
-    public GridResponse selectDsptMngGridList(String sBrandId, String sStoreId, String fromDt, String toDt, GridRequest gridRequest) throws Exception {
+    public GridResponse selectUnpaidMngGridList(String sBrandId, String sStoreId, String fromDt, String toDt, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
@@ -54,13 +34,19 @@ public class UnpaidMngService extends CommonService {
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
         List<StlMgntBaseInfoEntity> entities = unpaidMngMapper.selectUnpaidMngGridList(sBrandId, sStoreId, fromDt, toDt, gridRequest);
         List<Object> gridRows = entities.stream()
-                .map(m -> DsptMngListResponse.builder()
+                .map(m -> UnpaidMngListResponse.builder()
                         .viewCd("R")
-
-                        .storeId(m.getStoreId())
-                        .storeNm(m.getStoreNm())
+                        .sttlMgntUnqNo(m.getSttlMgntUnqNo())
+                        .sttlReqDt(m.getSttlReqDt())
                         .brandId(m.getBrandId())
                         .brandNm(m.getBrandNm())
+                        .storeId(m.getStoreId())
+                        .storeNm(m.getStoreNm())
+                        .sttlStCd(m.getSttlStCd())
+                        .sttlStNm(m.getSttlStNm())
+                        .sttlReqAmt(m.getSttlReqAmt())
+                        .sttlDt(m.getSttlDt())
+                        .sttlAmt(m.getSttlAmt())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/java/com/oqpo/api/web/controller/loanmng/UnpaidMngController.java

@@ -0,0 +1,61 @@
+package com.oqpo.api.web.controller.loanmng;
+
+import com.oqpo.api.service.loanmng.UnpaidMngService;
+import com.oqpo.api.web.dto.request.loanmng.*;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.loanmng.UnpaidMngInfoResponse;
+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.*;
+
+import javax.validation.Valid;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/unpaid/mng")
+@Api(tags = {"미납금관리 (UnpaidMngController) -- 완료"})
+public class UnpaidMngController {
+
+    @Autowired
+    private UnpaidMngService unpaidMngService;
+
+    /**
+     * 설명 : 미납금관리 그리드 리스트
+     *
+     * @param unpaidMngGridRequest
+     * @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 UnpaidMngGridRequest unpaidMngGridRequest) throws Exception {
+        return ResponseEntity.ok(unpaidMngService.selectUnpaidMngGridList(unpaidMngGridRequest.getSBrandId(), unpaidMngGridRequest.getSStoreId(),
+                unpaidMngGridRequest.getFromDt(), unpaidMngGridRequest.getToDt(), unpaidMngGridRequest.toDTO(unpaidMngGridRequest)));
+    }
+
+    /**
+     * 설명 : 미납금 정보
+     *
+     * @param sttlMgntUnqNo
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "sttlMgntUnqNo", value = "정산관리고유번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "미납금 정보")
+    @GetMapping("/info-unpaid")
+    public ResponseEntity<UnpaidMngInfoResponse> infoUnpaid(@RequestParam(value = "sttlMgntUnqNo") String sttlMgntUnqNo) throws Exception {
+        return ResponseEntity.ok(unpaidMngService.selectUnpaidMngInfo(sttlMgntUnqNo));
+    }
+
+}

src/main/java/com/oqpo/api/web/dto/request/loanmng/UnpaidMngGridRequest.java

@@ -0,0 +1,25 @@
+package com.oqpo.api.web.dto.request.loanmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class UnpaidMngGridRequest extends GridRequest {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
+    @ApiModelProperty(value = "조회시작일자")
+    private String fromDt;
+    @ApiModelProperty(value = "조회종료일자")
+    private String toDt;
+
+    protected UnpaidMngGridRequest(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/loanmng/UnpaidMngInfoResponse.java

@@ -63,19 +63,62 @@ public class UnpaidMngInfoResponse {
     public static UnpaidMngInfoResponse toDTO(StlMgntBaseInfoEntity entity, List<StlMgntDtlPtclEntity> dtlPtclEntities) {
         if (entity == null) return null;
         return UnpaidMngInfoResponse.builder()
+                .sttlMgntUnqNo(entity.getSttlMgntUnqNo())
+                .sttlReqDt(entity.getSttlReqDt())
                 .brandId(entity.getBrandId())
                 .brandNm(entity.getBrandNm())
-
                 .storeId(entity.getStoreId())
                 .storeNm(entity.getStoreNm())
+                .sttlStCd(entity.getSttlStCd())
+                .sttlStNm(entity.getSttlStNm())
+                .sttlReqAmt(entity.getSttlReqAmt())
+                .sttlDt(entity.getSttlDt())
+                .sttlAmt(entity.getSttlAmt())
+                .sttlRegMgrNm(entity.getSttlRegMgrNm())
+                .sttlRegMgrId(entity.getSttlRegMgrId())
                 .sysRegDttm(entity.getSysRegDttm())
                 .sysRegId(entity.getSysRegId())
                 .sysChgDttm(entity.getSysChgDttm())
                 .sysChgId(entity.getSysChgId())
                 .stlDtlPtclList(dtlPtclEntities.stream()
                         .map(m -> StlDtlPtclInfo.builder()
-
-
+                                .sttlMgntUnqNo(m.getSttlMgntUnqNo())
+                                .sttlMgntDtlNo(m.getSttlMgntDtlNo())
+                                .brandId(m.getBrandId())
+                                .brandNm(m.getBrandNm())
+                                .whsMgntUnqNo(m.getWhsMgntUnqNo())
+                                .rtnMgntUnqNo(m.getRtnMgntUnqNo())
+                                .storeId(m.getStoreId())
+                                .storeNm(m.getStoreNm())
+                                .itemId(m.getItemId())
+                                .itemNm(m.getItemNm())
+                                .unit(m.getUnit())
+                                .unitAmt(m.getUnitAmt())
+                                .podrQty(m.getPodrQty())
+                                .dlvQty(m.getDlvQty())
+                                .whsQty(m.getWhsQty())
+                                .colQty(m.getColQty())
+                                .whsColQty(m.getWhsColQty())        /* 입고/수거수량 */
+                                .dlvCmpltDt(m.getDlvCmpltDt())
+                                .colDt(m.getColDt())
+                                .whsColDt(m.getWhsColDt())          /* 입고/수거일자 */
+                                .whsAmt(m.getWhsAmt())
+                                .colAmt(m.getColAmt())
+                                .whsColAmt(m.getWhsColAmt())        /* 입고/수거금액 */
+                                .sttlDvsn(m.getSttlDvsn())
+                                .sttlDvsnNm(m.getSttlDvsnNm())
+                                .pchPodrUnqNo(m.getPchPodrUnqNo())
+                                .pchPodrDtlNo(m.getPchPodrDtlNo())
+                                .pchReqUnqNo(m.getPchReqUnqNo())
+                                .pchReqDtlNo(m.getPchReqDtlNo())
+                                .rtnPodrUnqNo(m.getRtnPodrUnqNo())
+                                .rtnPodrDtlNo(m.getRtnPodrDtlNo())
+                                .rtnReqUnqNo(m.getRtnReqUnqNo())
+                                .rtnReqDtlNo(m.getRtnReqDtlNo())
+                                .sysRegDttm(m.getSysRegDttm())
+                                .sysRegId(m.getSysRegId())
+                                .sysChgDttm(m.getSysChgDttm())
+                                .sysChgId(m.getSysChgId())
                                 .build())
                         .collect(Collectors.toList()))
                 .build();

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

@@ -0,0 +1,42 @@
+package com.oqpo.api.web.dto.response.loanmng;
+
+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 UnpaidMngListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "정산관리고유번호")
+    private String sttlMgntUnqNo;
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+    @ApiModelProperty(value = "매장명")
+    private String storeNm;
+    @ApiModelProperty(value = "정산상태코드")
+    private String sttlStCd;
+    @ApiModelProperty(value = "정산상태명")
+    private String sttlStNm;
+    @ApiModelProperty(value = "정산요청일자")
+    private String sttlReqDt;
+    @ApiModelProperty(value = "정산요청금액")
+    private long sttlReqAmt;
+    @ApiModelProperty(value = "정산일자")
+    private String sttlDt;
+    @ApiModelProperty(value = "정산금액")
+    private long sttlAmt;
+    @ApiModelProperty(value = "계좌잔액")
+    private long acctBal;
+
+}