diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java index 094d290bfed4c654ccf252240b94d0e0ccf4e68a..3352b8d7e6d8a365c6d6fbe70b7b352daa42dabe 100644 --- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java @@ -34,6 +34,9 @@ public class OrderQuery { // 审核状态 @ApiModelProperty(value = "审核状态") private String auditStatus; + // 支付状态 + @ApiModelProperty(value = "支付状态") + private Integer payStatus; public String getCode() { return code; @@ -99,6 +102,14 @@ public class OrderQuery { this.auditStatus = auditStatus; } + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + @Override public String toString() { return "OrderQuery{" + @@ -109,7 +120,8 @@ public class OrderQuery { ", destRegionCode='" + destRegionCode + '\'' + ", pickDateBegin=" + pickDateBegin + ", pickDateEnd=" + pickDateEnd + - ", auditStatus=" + auditStatus + + ", auditStatus='" + auditStatus + '\'' + + ", payStatus='" + payStatus + '\'' + '}'; } } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java index 8924d65495a1a8efaf14baa6f31e6c2bda4587a5..0d0b46e003dbd0cd4c157fd29e7d116ec6161075 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java @@ -24,6 +24,8 @@ public class OrderQueryBO { private Date pickDateEnd; // 审核状态 private String auditStatus; + // 支付状态 + private Integer payStatus; public String getCode() { return code; @@ -89,6 +91,14 @@ public class OrderQueryBO { this.auditStatus = auditStatus; } + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + @Override public String toString() { return "OrderQueryBO{" + @@ -99,7 +109,8 @@ public class OrderQueryBO { ", destRegionCode='" + destRegionCode + '\'' + ", pickDateBegin=" + pickDateBegin + ", pickDateEnd=" + pickDateEnd + - ", auditStatus=" + auditStatus + + ", auditStatus='" + auditStatus + '\'' + + ", payStatus=" + payStatus + '}'; } } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java index 31c8039a7c8a448af062b81d988a0c25af756ebc..128f0b23e10e61037519048c8a55481498339098 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java @@ -30,6 +30,8 @@ public class OrderViewBO { private String comment; private String auditComment; private String attachAuditStatusText; + // 支付状态 + private Integer payStatus; // 销售订单地址表 private String departRegionCode; @@ -288,6 +290,14 @@ public class OrderViewBO { this.attachs = attachs; } + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + @Override public String toString() { return "OrderViewBO{" + @@ -309,6 +319,7 @@ public class OrderViewBO { ", comment='" + comment + '\'' + ", auditComment='" + auditComment + '\'' + ", attachAuditStatusText='" + attachAuditStatusText + '\'' + + ", payStatus=" + payStatus + ", departRegionCode='" + departRegionCode + '\'' + ", departRegionName='" + departRegionName + '\'' + ", departContact='" + departContact + '\'' + diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java index dc79729c384e1205efa7335627a736de6d59fb5b..1bbb359e8559b8839a25cba2062d91cc206b7e32 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java @@ -219,6 +219,7 @@ public class OrderServiceImpl implements OrderService { queryMap.put("auditStatus", queryBO.getAuditStatus()); queryMap.put("pickDateBegin", queryBO.getPickDateBegin()); queryMap.put("pickDateEnd", queryBO.getPickDateEnd()); + queryMap.put("payStatus", queryBO.getPayStatus()); return buildListSaleOrder(queryMap, pageVo); } diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java index d95dfd367015db8aa040e2ea092cb08d6329f99c..1e41439c082a7c36bd0e663ea6af57ddff421abf 100644 --- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java @@ -64,6 +64,8 @@ public class OrderViewDAO { private String destAddr; // 提车时间 private String pickTime; + // 支付状态 + private Integer payStatus; public Integer getId() { return id; @@ -385,6 +387,38 @@ public class OrderViewDAO { this.pickTime = pickTime; } + public Boolean getTicket() { + return isTicket; + } + + public void setTicket(Boolean ticket) { + isTicket = ticket; + } + + public Boolean getPick() { + return isPick; + } + + public void setPick(Boolean pick) { + isPick = pick; + } + + public Boolean getDeliv() { + return isDeliv; + } + + public void setDeliv(Boolean deliv) { + isDeliv = deliv; + } + + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + @Override public String toString() { return "OrderViewDAO{" + @@ -425,9 +459,10 @@ public class OrderViewDAO { ", transportType=" + transportType + ", isPick=" + isPick + ", isDeliv=" + isDeliv + - ", departAddr=" + departAddr + - ", destAddr=" + destAddr + - ", pickTime=" + pickTime + + ", departAddr='" + departAddr + '\'' + + ", destAddr='" + destAddr + '\'' + + ", pickTime='" + pickTime + '\'' + + ", payStatus=" + payStatus + '}'; } } diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml index 4f59eb041277e9444e2ce998dff2b90dae7b4d42..c1ca3ba8b5da2615db63fa18860ed038a04dd82e 100644 --- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml +++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml @@ -38,6 +38,7 @@ +