Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

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

@@ -38,6 +38,8 @@ public class StlMgntBaseInfoEntity implements Serializable {
     private String sttlDt;
     @ApiModelProperty(value = "정산금액")
     private Long sttlAmt;
+    @ApiModelProperty(value = "정산반려사유")
+    private String sttlRjctRsn;
     @ApiModelProperty(value = "정산등록담당자명")
     private String sttlRegMgrNm;
     @ApiModelProperty(value = "정산등록담당자아이디")

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

@@ -25,7 +25,7 @@ public class DsptMngInfoResponse {
     @ApiModelProperty(value = "요청시각")
     private String reqTm;
     @ApiModelProperty(value = "입금금액")
-    private long dpstAmt;
+    private Long dpstAmt;
     @ApiModelProperty(value = "입금일자")
     private String dpstDt;
     @ApiModelProperty(value = "입금자명")

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

@@ -25,7 +25,7 @@ public class DsptMngListResponse {
     @ApiModelProperty(value = "브랜드명")
     private String brandNm;
     @ApiModelProperty(value = "입금금액")
-    private long dpstAmt;
+    private Long dpstAmt;
     @ApiModelProperty(value = "입금일자")
     private String dpstDt;
     @ApiModelProperty(value = "입금자명")

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

@@ -29,15 +29,15 @@ public class LoanHistListResponse {
     @ApiModelProperty(value = "매체구분명")
     private String mediaDvsnNm;
     @ApiModelProperty(value = "거래금액")
-    private long trscAmt;
+    private Long trscAmt;
     @ApiModelProperty(value = "입금금액")
-    private long dpstAmt;
+    private Long dpstAmt;
     @ApiModelProperty(value = "지급금액")
-    private long paymAmt;
+    private Long paymAmt;
     @ApiModelProperty(value = "거래전잔액")
-    private long trscBfBal;
+    private Long trscBfBal;
     @ApiModelProperty(value = "거래후잔액")
-    private long trscAfBal;
+    private Long trscAfBal;
     @ApiModelProperty(value = "비고")
     private String loanDesc;
 

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

@@ -28,21 +28,21 @@ public class LoanMngInfoResponse {
     @ApiModelProperty(value = "계좌번호")
     private String acctNo;
     @ApiModelProperty(value = "계좌잔액")
-    private long acctBal;
+    private Long acctBal;
     @ApiModelProperty(value = "여신구분")
     private String loanDvsn;
     @ApiModelProperty(value = "여신구분명")
     private String loanDvsnNm;
     @ApiModelProperty(value = "신용한도금액")
-    private long credtLimitAmt;
+    private Long credtLimitAmt;
     @ApiModelProperty(value = "충전한도금액")
-    private long chrgeLimitAmt;
+    private Long chrgeLimitAmt;
     @ApiModelProperty(value = "신용한도사용여부")
     private String credtLimitUseYn;
     @ApiModelProperty(value = "사용금액합계")
-    private long useAmtTotal;
+    private Long useAmtTotal;
     @ApiModelProperty(value = "가수금액합계")
-    private long tmpRcvAcctTotal;
+    private Long tmpRcvAcctTotal;
     @ApiModelProperty(value = "사용여부")
     private String useYn;
     @ApiModelProperty(value = "사용여부명")

src/main/java/com/oqpo/api/web/dto/response/stockmng/StockCddDtlListResponse.java

@@ -34,7 +34,7 @@ public class StockCddDtlListResponse {
     private String locationNm;
 
     @ApiModelProperty(value = "실사순번")
-    private int cddSeq;
+    private Integer cddSeq;
     @ApiModelProperty(value = "품목아이디")
     private String itemId;
     @ApiModelProperty(value = "품목명")
@@ -42,10 +42,10 @@ public class StockCddDtlListResponse {
     @ApiModelProperty(value = "단위(코드: DSTRBT_COST_UNIT)")
     private String unit;
     @ApiModelProperty(value = "전산기존수량")
-    private int comExstQty;
+    private Integer comExstQty;
     @ApiModelProperty(value = "실사수량")
-    private int cddQty;
+    private Integer cddQty;
     @ApiModelProperty(value = "변동수량")
-    private int chgQty;
+    private Integer chgQty;
 
 }

src/main/java/com/oqpo/api/web/dto/response/stockmng/StockMngInfoResponse.java

@@ -26,9 +26,9 @@ public class StockMngInfoResponse {
     @ApiModelProperty(value = "단위")
     private String unit;
     @ApiModelProperty(value = "재고수량")
-    private int stckQty;
+    private Integer stckQty;
     @ApiModelProperty(value = "적정재고수량")
-    private int prpStckQty;
+    private Integer prpStckQty;
     @ApiModelProperty(value = "안전재고비율")
     private BigDecimal sftStckRt;
     @ApiModelProperty(value = "현재고비율")

src/main/java/com/oqpo/api/web/dto/response/stockmng/StockMngListResponse.java

@@ -39,9 +39,9 @@ public class StockMngListResponse {
     @ApiModelProperty(value = "단위")
     private String unit;
     @ApiModelProperty(value = "재고수량-현재고수량")
-    private int stckQty;
+    private Integer stckQty;
     @ApiModelProperty(value = "적정재고수량")
-    private int prpStckQty;
+    private Integer prpStckQty;
     @ApiModelProperty(value = "안전재고비율")
     private BigDecimal sftStckRt;
     @ApiModelProperty(value = "현재고비율")

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

@@ -53,6 +53,8 @@ public class SttlMngInfoResponse {
     private String sysChgDttm;
     @ApiModelProperty(value = "시스템변경아이디")
     private String sysChgId;
+    @ApiModelProperty(value = "정산반려사유")
+    private String sttlRjctRsn;
 
     @ApiModelProperty(value = "계좌잔액")
     private Long acctBal;
@@ -70,6 +72,7 @@ public class SttlMngInfoResponse {
                 .spplyNm(entity.getSpplyNm())
                 .sttlStCd(entity.getSttlStCd())
                 .sttlStNm(entity.getSttlStNm())
+                .sttlRjctRsn(entity.getSttlRjctRsn())
                 .sttlReqAmt(entity.getSttlReqAmt())
                 .sttlDt(entity.getSttlDt())
                 .sttlAmt(entity.getSttlAmt())